nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,645 Commits 53 Branches 630 Tags 125 MiB
64293135df
Commit Graph

17645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
64293135df Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-11 11:17:18 -04:00
Nick Mathewson
7ef2939e5a Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-11 11:16:59 -04:00
Nick Mathewson
82d8944928 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-10-11 11:16:45 -04:00
Karsten Loesing
3b0265198f Update to the October 2013 GeoIP database. 2013-10-11 13:36:30 +02:00
Roger Dingledine
f96a8d5fa3 Report bootstrapping progress correctly when downloading microdescs 
We had updated our "do we have enough microdescs to begin building
circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we
left the bootstrap status event logic at "how far through getting 1/4
of them are we?"

Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see
bug 5343).
 2013-10-10 21:39:21 -04:00
Roger Dingledine
78251e004f Merge branch 'maint-0.2.4' 2013-10-10 21:25:01 -04:00
Roger Dingledine
eb5d75e96a rewrite history to improve two changelog entries 2013-10-10 21:17:19 -04:00
Nick Mathewson
43f95e38ab Merge remote-tracking branch 'sysrqb/bug9950' 2013-10-10 11:27:28 -04:00
Nick Mathewson
df4693fed5 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-10 11:24:16 -04:00
Nick Mathewson
2c7ed0406f Merge branch 'bug9644_024' into maint-0.2.4 2013-10-10 11:23:46 -04:00
Nick Mathewson
3d817fa29c Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-10 11:18:17 -04:00
Nick Mathewson
7b1b8c3694 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-10 11:18:07 -04:00
Nick Mathewson
004a9c6dd1 Fix unit test for format_helper_exit_status 
Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.
 2013-10-10 11:15:35 -04:00
Nick Mathewson
97285bc465 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-10 10:55:58 -04:00
Nick Mathewson
1137817319 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-10 10:55:24 -04:00
Nick Mathewson
6eb7f2f889 Merge remote-tracking branch 'public/bug9928' into maint-0.2.3 2013-10-10 10:53:27 -04:00
Matthew Finkel
528e3bf892 Free the smartlist after parsing csv config option 
Bugfix on 1293835440, which implemented
6752: Not in any released tor.
 2013-10-09 23:16:57 +00:00
Nick Mathewson
3b6c48328b Or maybe it is 2013. Who can say? 2013-10-09 12:48:18 -04:00
Nick Mathewson
bcde4cc4cf Merge remote-tracking branch 'karsten/task-9854-2' 2013-10-09 12:36:24 -04:00
Nick Mathewson
0e3cf3ebf8 Merge remote-tracking branch 'origin/maint-0.2.4' 
Use "ours" strategy to avoid taking 73a0bb16b9
from 0.2.4.  We _do_ want to keep torrc.sample.in changes in 0.2.5.
 2013-10-09 12:07:01 -04:00
Nick Mathewson
73a0bb16b9 Partially revert "Clarify who learns about ContactInfo." 
This reverts the torrc.sample.in changes from commit
66a04a6ac3.

We're going to not make this change in 0.2.4, since changing
torrc.sample.in makes all the debian users do some pointless
busywork. see tor-dev discusion of 9 Oct 2013.
 2013-10-09 12:02:53 -04:00
Karsten Loesing
795c0f7b00 Update last modified timestamp of torrc.sample.in. 2013-10-09 17:41:05 +02:00
Nick Mathewson
882fb8383d Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-09 09:45:21 -04:00
Nick Mathewson
270dcc9131 Changes file for 9854 2013-10-09 09:43:54 -04:00
Karsten Loesing
66a04a6ac3 Clarify who learns about ContactInfo. 
Explicitly include bridges, and note that we archive and publish all
descriptors.

(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)

Related to #9854.
 2013-10-09 09:43:18 -04:00
Nick Mathewson
9de456a303 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-08 16:47:49 -04:00
Nick Mathewson
b8abadedd3 When examining interfaces to find an address, discard non-up ones. 
Patch from "hantwister" on trac. Fixes bug #9904; bugfix on
0.2.3.11-alpha.
 2013-10-08 16:46:29 -04:00
Nick Mathewson
30b8fc3e0d Merge remote-tracking branch 'origin/maint-0.2.4' 
Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
 2013-10-08 16:09:45 -04:00
Nick Mathewson
fa1034cd99 Changes file for 9866 2013-10-08 16:06:36 -04:00
Peter Palfrader
2c270136a4 Anchors for options (re#9866) 2013-10-08 16:06:19 -04:00
Nick Mathewson
66624ded39 Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	src/or/relay.c
 2013-10-08 13:38:47 -04:00
Nick Mathewson
50fc8fb5c5 Merge remote-tracking branch 'public/bug9927' into maint-0.2.4 2013-10-08 13:37:13 -04:00
Nick Mathewson
b571b966f2 Tweak a comment 2013-10-08 12:18:31 -04:00
Nick Mathewson
1060688d2a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-08 12:17:14 -04:00
Nick Mathewson
7e0f1fa52a Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-08 12:16:42 -04:00
Nick Mathewson
5e0404265f Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-08 12:11:37 -04:00
Nick Mathewson
0c3c47565d Merge remote-tracking branch 'public/bug9596' into maint-0.2.4 2013-10-08 12:10:47 -04:00
Nick Mathewson
bfe56e05b0 Give credit to bug reporter for 9928 2013-10-08 12:06:06 -04:00
Nick Mathewson
63234b1839 Merge branch 'bug9922' 2013-10-08 12:03:09 -04:00
Nick Mathewson
b2a050cb2a Finish changelog message for 9922. 2013-10-08 12:02:34 -04:00
Roger Dingledine
5f13ae4b03 don't lie about bootstrap progress when clients use bridges 
we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.
 2013-10-08 11:50:53 -04:00
Nick Mathewson
c8c2298015 Simply route length generation code. 
The old code had logic to use a shorter path length if we didn't
have enough nodes. But we don't support 2-node networks anwyay.

Fix for #9926.  I'm not calling this a bugfix on any particular
version, since a 2-node network would fail to work for you for a lot
of other reasons too, and it's not clear to me when that began, or if
2-node networks would ever have worked.
 2013-10-08 11:48:33 -04:00
Nick Mathewson
c7c24785ee Generate bootstrapping status messages for microdescs too 
Fix for 9927.
 2013-10-08 11:32:02 -04:00
Nick Mathewson
17bcfb2604 Raise buffer size, fix checks for format_exit_helper_status. 
This is probably not an exploitable bug, since you would need to have
errno be a large negative value in the unix pluggable-transport launcher
case.  Still, best avoided.

Fixes bug 9928; bugfix on 0.2.3.18-rc.
 2013-10-08 11:13:21 -04:00
Nick Mathewson
245ecfff36 Changes file for 9866 2013-10-07 11:32:06 -04:00
Peter Palfrader
4e37eba0ac Anchors for options (re#9866) 2013-10-07 11:31:01 -04:00
Nick Mathewson
a6b4934037 Bump version to 0.2.5.1-alpha-dev 2013-10-02 22:41:41 -04:00
Nick Mathewson
566645b5ed Merge remote-tracking branch 'origin/maint-0.2.4' 2013-10-02 22:40:01 -04:00
Nick Mathewson
0bec65277a Merge branch 'bug9880_fix' into maint-0.2.4 2013-10-02 22:39:27 -04:00
Nick Mathewson
557f332957 Fix a bug in our bug 9776 fix. 
By calling circuit_n_chan_done() unconditionally on close, we were
closing pending connections that might not have been pending quite for
the connection we were closing.  Fix for bug 9880.

Thanks to skruffy for finding this and explaining it patiently until
we understood.
 2013-10-02 22:20:18 -04:00