September 2011 - tor-commits - lists.torproject.org

[tor/master] fix default for TokenBucketRefillInterval in man page
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 0e4f5e7cb1b8467ee1da824e994d285c9ba773ce Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 18:23:17 2011 -0400 fix default for TokenBucketRefillInterval in man page --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4ae721e..0ef61cb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -742,7 +742,7 @@ The following options are useful only for clients (that is, if NUM must be between 1 and 1000, inclusive. Note that the configured bandwidth limits are still expressed in bytes per second: this option only affects the frequency with which Tor checks to see whether - previously exhausted connections may read again. (Default: 10 msec.) + previously exhausted connections may read again. (Default: 100 msec.) **TrackHostExits** __host__,__.domain__,__...__:: For each value in the comma separated list, Tor will track recent

1 0

r25135: {website} update the mirrors table, add the torproject.nl mirror. (in website/trunk: . include)
by Andrew Lewman 28 Sep '11

28 Sep '11

Author: phobos Date: 2011-09-28 21:23:37 +0000 (Wed, 28 Sep 2011) New Revision: 25135 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the mirrors table, add the torproject.nl mirror. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-28 19:19:03 UTC (rev 25134) +++ website/trunk/include/mirrors-table.wmi 2011-09-28 21:23:37 UTC (rev 25135) @@ -1,49 +1,49 @@ <tr> - <td>IS</td> + <td>NL</td> - <td>torproject.is</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> + <td>NL</td> - <td>FoDT.IT</td> + <td>CCC</td> <td>Up to date</td> - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>DK</td> - <td>searchprivate</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,49 +52,32 @@ <tr> - <td>DE</td> + <td>EE</td> - <td>beme it</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td>NW Linux</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist">http</a></td> - <td><a href="http://torproject.nwlinux.us">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> <td>IS</td> - <td>TheOnionRouter</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://torproject.is/dist">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,19 +86,19 @@ <tr> - <td>NL</td> + <td>US</td> - <td>CCC</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> @@ -171,6 +154,23 @@ <tr> + <td>AT</td> + + <td>FoDT.IT</td> + + <td>Up to date</td> + + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>BarkerJr</td> @@ -188,15 +188,15 @@ <tr> - <td>NL</td> + <td>US</td> - <td>Amorphis</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -205,32 +205,32 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>factor.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -239,34 +239,17 @@ <tr> - <td>US</td> + <td>HU</td> - <td>BarkerJr</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://mirror.tor.hu/dist">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor">https</a></td> <td> - </td> <td> - </td> </tr> @@ -275,34 +258,34 @@ <td>DE</td> - <td>chaos darmstadt</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>HU</td> + <td>US</td> - <td>Unknown</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist">http</a></td> + <td><a href="http://torproject.nwlinux.us">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> @@ -341,15 +324,15 @@ <tr> - <td>US</td> + <td>FR</td> - <td>AskApache</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +341,15 @@ <tr> - <td>FR</td> + <td>IS</td> - <td>LazyTiger</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,40 +358,74 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>[[:bbs:]]</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-28 19:19:03 UTC (rev 25134) +++ website/trunk/update-mirrors.pl 2011-09-28 21:23:37 UTC (rev 25135) @@ -696,6 +696,24 @@ httpsDistMirror => "https://factor.cc/tor/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror044 => { + adminContact => "", + orgName => "", + isoCC => "NL", + subRegion => "", + region => "NL", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://www.torproject.nl/", + httpsWebsiteMirror => "https://www.torproject.nl/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://www.torproject.nl/dist/", + httpsDistMirror => "https://www.torproject.nl/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[tor/master] fold in recent changes entries
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 25f786f7ec97b7915d84f88a549c47524b3910ee Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:41:29 2011 -0400 fold in recent changes entries --- ChangeLog | 11 +++++++++++ changes/bug4115 | 7 ------- changes/bug4124 | 6 ------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6890d2d..6e62e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,15 @@ Changes in version 0.2.3.5-alpha - 2011-09-28 + o Security fixes: + - Bridge relays now do their directory fetches inside Tor TLS + connections, like all the other clients do, rather than connecting + directly to the DirPort like public relays do. Removes another + avenue for enumerating bridges. Fixes part of bug 4115; bugfix + on 0.2.0.35. + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + o Major bugfixes: - Fix a crash bug that could occur when the same microdescriptor was referenced by two node_t objects at once. Fix for bug 4118; bugfix diff --git a/changes/bug4115 b/changes/bug4115 deleted file mode 100644 index 626791a..0000000 --- a/changes/bug4115 +++ /dev/null @@ -1,7 +0,0 @@ - o Security fixes: - - Bridge relays now do their directory fetches inside Tor TLS - connections, like all the other clients do, rather than connecting - directly to the DirPort like public relays do. Removes another - avenue for enumerating bridges. Fixes part of bug 4115; bugfix - on 0.2.0.35. - diff --git a/changes/bug4124 b/changes/bug4124 deleted file mode 100644 index abe93cc..0000000 --- a/changes/bug4124 +++ /dev/null @@ -1,6 +0,0 @@ - o Security fixes: - - Bridges relays now build circuits for themselves in a more similar - way to how clients build them. Removes another avenue for - enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, - when bridges were introduced. -

1 0

[tor/master] refill our token buckets 10 times/sec, not 100
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit f6db0f128c8f47b660ec3e872966fd3b951dd1a9 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:38:36 2011 -0400 refill our token buckets 10 times/sec, not 100 refilling often is good, but refilling often has unclear side effects on a) cpu load, and b) making sure every cell, ever, is sent out one at a time --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index e22f539..c44b09c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -386,7 +386,7 @@ static config_var_t _option_vars[] = { OBSOLETE("SysLog"), V(TestSocks, BOOL, "0"), OBSOLETE("TestVia"), - V(TokenBucketRefillInterval, MSEC_INTERVAL, "10 msec"), + V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), OBSOLETE("TrafficShaping"),

1 0

[tor/master] bridges should use create_fast cells for their own circuits
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit ff8aba7053728d5b8f51152e10d73a7535e495a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:35:27 2011 -0400 bridges should use create_fast cells for their own circuits fixes bug 4124, as noticed in bug 4115 --- changes/bug4124 | 6 ++++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug4124 b/changes/bug4124 new file mode 100644 index 0000000..abe93cc --- /dev/null +++ b/changes/bug4124 @@ -0,0 +1,6 @@ + o Security fixes: + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 888023d..c864fd2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1961,9 +1961,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ) return 1; /* our hand is forced: only a create_fast will work. */ if (!options->FastFirstHopPK) return 0; /* we prefer to avoid create_fast */ - if (server_mode(options)) { + if (public_server_mode(options)) { /* We're a server, and we know an onion key. We can choose. - * Prefer to blend in. */ + * Prefer to blend our circuit into the other circuits we are + * creating on behalf of others. */ return 0; }

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 36829539d64dab47e07bd619b7b833ef50d26853 Merge: 4e88a3b ff8aba7 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:38:02 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4124 | 6 ++++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] bridges should use create_fast cells for their own circuits
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit ff8aba7053728d5b8f51152e10d73a7535e495a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:35:27 2011 -0400 bridges should use create_fast cells for their own circuits fixes bug 4124, as noticed in bug 4115 --- changes/bug4124 | 6 ++++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug4124 b/changes/bug4124 new file mode 100644 index 0000000..abe93cc --- /dev/null +++ b/changes/bug4124 @@ -0,0 +1,6 @@ + o Security fixes: + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 888023d..c864fd2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1961,9 +1961,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ) return 1; /* our hand is forced: only a create_fast will work. */ if (!options->FastFirstHopPK) return 0; /* we prefer to avoid create_fast */ - if (server_mode(options)) { + if (public_server_mode(options)) { /* We're a server, and we know an onion key. We can choose. - * Prefer to blend in. */ + * Prefer to blend our circuit into the other circuits we are + * creating on behalf of others. */ return 0; }

1 0

r25134: {} add the last checkout of JTor.git from github. (projects/misc/phobos)
by Andrew Lewman 28 Sep '11

28 Sep '11

Author: phobos Date: 2011-09-28 19:19:03 +0000 (Wed, 28 Sep 2011) New Revision: 25134 Added: projects/misc/phobos/JTor.git.tgz Log: add the last checkout of JTor.git from github. Added: projects/misc/phobos/JTor.git.tgz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/JTor.git.tgz ___________________________________________________________________ Added: svn:mime-type + application/x-gtar-compressed

1 0

[tor/master] bug 4115: make bridges use begindir for their dir fetches
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 0b5d2646d56fe351b8b2b4bc97bbad30cb34b6d4 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 14:50:43 2011 -0400 bug 4115: make bridges use begindir for their dir fetches removes another avenue for enumerating bridges. --- changes/bug4115 | 7 +++++++ src/or/directory.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug4115 b/changes/bug4115 new file mode 100644 index 0000000..626791a --- /dev/null +++ b/changes/bug4115 @@ -0,0 +1,7 @@ + o Security fixes: + - Bridge relays now do their directory fetches inside Tor TLS + connections, like all the other clients do, rather than connecting + directly to the DirPort like public relays do. Removes another + avenue for enumerating bridges. Fixes part of bug 4115; bugfix + on 0.2.0.35. + diff --git a/src/or/directory.c b/src/or/directory.c index 52fec6b..e3cc70f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -785,8 +785,7 @@ directory_command_should_use_begindir(or_options_t *options, return 0; /* We don't know an ORPort -- no chance. */ if (!anonymized_connection) if (!fascist_firewall_allows_address_or(addr, or_port) || - directory_fetches_from_authorities(options) || - (server_mode(options) && !options->Address)) + directory_fetches_from_authorities(options)) return 0; /* We're firewalled or are acting like a relay -- also no. */ if (!options->TunnelDirConns && router_purpose != ROUTER_PURPOSE_BRIDGE)

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 4e88a3bc3e1a195864c3185d16d89e090246fc55 Merge: 458cc9d 0b5d264 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:13:05 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4115 | 7 +++++++ src/or/directory.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0