- tor-commits - lists.torproject.org

r25034: {website} update the mirrors. (website/trunk/include)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:17:53 +0000 (Wed, 07 Sep 2011) New Revision: 25034 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-07 03:16:51 UTC (rev 25033) +++ website/trunk/include/mirrors-table.wmi 2011-09-07 03:17:53 UTC (rev 25034) @@ -18,15 +18,15 @@ <tr> - <td>US</td> + <td>NL</td> - <td>searchprivate</td> + <td>Amorphis</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.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>DE</td> + <td>AT</td> - <td>chaos darmstadt</td> + <td>cyberarmy</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.cyberarmy.at/dist">http</a></td> + <td><a href="http://tor.cyberarmy.at">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -54,64 +54,47 @@ <td>US</td> - <td>BarkerJr</td> + <td>searchprivate</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://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> -</tr> - -<tr> - - <td>HU</td> - - <td>Unknown</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> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>torservers</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></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>IR</td> + <td>EE</td> - <td>Ninjas</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> - <td><a href="http://onion.anonymo.us.org/">http</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> - </td> <td> - </td> @@ -122,64 +105,47 @@ <td>DE</td> - <td>beme it</td> + <td>chaos darmstadt</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://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><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>INT</td> + <td>US</td> - <td>CoralCDN</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">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> - <td>NL</td> + <td>HU</td> - <td>Amorphis</td> + <td>Unknown</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://mirror.tor.hu/dist">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -188,32 +154,32 @@ <tr> - <td>AT</td> + <td>DE</td> - <td>cyberarmy</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>IR</td> - <td>CCC</td> + <td>Ninjas</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://onion.anonymo.us.org/dist/">http</a></td> + <td><a href="http://onion.anonymo.us.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -222,19 +188,19 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>beme it</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.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> @@ -275,17 +241,17 @@ <td>US</td> - <td>AskApache</td> + <td>Xpdm</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://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -341,15 +307,15 @@ <tr> - <td>DE</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> - <td><a href="http://mirror.hs-fulda.org/tor/">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> @@ -358,15 +324,15 @@ <tr> - <td>EE</td> + <td>US</td> - <td>CyberSIDE</td> + <td>AskApache</td> - <td>Out of date</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://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -379,7 +345,7 @@ <td>India Tor Fans</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://www.torproject.org.in/dist/">http</a></td> @@ -426,11 +392,28 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> + <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>tor</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://torproject.is/dist">http</a></td> @@ -460,6 +443,23 @@ <tr> + <td>NL</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist">https</a></td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>TheOnionRouter</td> @@ -474,3 +474,37 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="https://torproject.crypto.is/dist">http</a></td> + <td><a href="https://torproject.crypto.is">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr>

1 0

r25033: {website} add commas in the right places. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:16:51 +0000 (Wed, 07 Sep 2011) New Revision: 25033 Modified: website/trunk/update-mirrors.pl Log: add commas in the right places. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-07 03:00:38 UTC (rev 25032) +++ website/trunk/update-mirrors.pl 2011-09-07 03:16:51 UTC (rev 25033) @@ -605,7 +605,7 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", - } + }, mirror036 => { adminContact => "", orgName => "", @@ -623,7 +623,7 @@ httpsDistMirror => "https://www.coevoet.nl/tor/dist", rsyncDistMirror => "", hiddenServiceMirror => "", - } + }, mirror037 => { adminContact => "", orgName => "",

1 0

r25032: {website} add the crypto.is mirror. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:00:38 +0000 (Wed, 07 Sep 2011) New Revision: 25032 Modified: website/trunk/update-mirrors.pl Log: add the crypto.is mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-07 02:57:42 UTC (rev 25031) +++ website/trunk/update-mirrors.pl 2011-09-07 03:00:38 UTC (rev 25032) @@ -623,6 +623,25 @@ httpsDistMirror => "https://www.coevoet.nl/tor/dist", rsyncDistMirror => "", hiddenServiceMirror => "", + } + mirror037 => { + adminContact => "", + orgName => "", + isoCC => "IS", + subRegion => "", + region => "IS", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "https://torproject.crypto.is", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "https://torproject.crypto.is/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + } ); my $count = values %m;

1 0

r25031: {website} add https://www.coevoet.nl/tor/dist mirror. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 02:57:42 +0000 (Wed, 07 Sep 2011) New Revision: 25031 Modified: website/trunk/update-mirrors.pl Log: add https://www.coevoet.nl/tor/dist mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-06 18:49:32 UTC (rev 25030) +++ website/trunk/update-mirrors.pl 2011-09-07 02:57:42 UTC (rev 25031) @@ -606,6 +606,23 @@ rsyncDistMirror => "", hiddenServiceMirror => "", } + mirror036 => { + adminContact => "", + orgName => "", + isoCC => "NL", + subRegion => "", + region => "NL", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "", + httpsDistMirror => "https://www.coevoet.nl/tor/dist", + rsyncDistMirror => "", + hiddenServiceMirror => "", ); my $count = values %m;

1 0

[torbrowser/maint-2.2] revert automatic port selection for windows tbbs (#3945)
by erinn＠torproject.org 07 Sep '11

07 Sep '11

commit 550edc2fe0267348190f381110163e6b2bae9f93 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Sep 7 03:22:40 2011 +0100 revert automatic port selection for windows tbbs (#3945) --- build-scripts/config/torrc | 2 -- build-scripts/config/vidalia.conf.ff | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 143c71a..2d63da9 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,6 +8,4 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index d66f53f..d03289e 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,5 +7,4 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc -AutoControl=true DataDirectory=.\\Data\\Tor

1 0

[torflow/master] revert fix for 3798
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit 01e268c7cb272bd5bb53d2f41783c16c1918461f Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 6 14:38:01 2011 -0700 revert fix for 3798 The fix for 3798 (https://trac.torproject.org/projects/tor/ticket/3798) introduced a new error: TorCtl.Connection.close() at program exit will occasionally cause BwAuthority to hang indefinitely. This issue was originally reported in ticket 3834 (https://trac.torproject.org/projects/tor/ticket/3834) TorCtl.Connection.close() should not be used at this time. The issue occurs when called in either atexit handlers as well as at the end of the main thread. --- NetworkScanners/BwAuthority/bwauthority_child.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 3aa13b2..f842843 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -338,11 +338,7 @@ def ignore_streams(c,hdlr): s.ignored = True hdlr.streams[s.strm_id] = s -def cleanup(c): - if c: - c.close() - c.block_until_close() - +def cleanup(): plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file): @@ -367,7 +363,7 @@ def setup_handler(out_dir, cookie_file): TorCtl.EVENT_TYPE.CIRC, TorCtl.EVENT_TYPE.STREAM_BW], True) - atexit.register(cleanup, c) + atexit.register(cleanup) return (c,h) def usage(argv):

1 0

[torflow/master] Submodule..
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit 5736529160df12435fb39d11f81a5da92f74d615 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 6 18:16:48 2011 -0700 Submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index a3ed3d0..e99394c 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa +Subproject commit e99394c46b30ed73ffbf02d5c6a39bf9b04416a2

1 0

[tor/release-0.2.2] fold in changes files so far
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit c79db17ec1982fdd871907cc925efd1e90a318a7 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 6 20:56:42 2011 -0400 fold in changes files so far --- ChangeLog | 18 ++++++++++++++++++ changes/bug3898a | 6 ------ changes/bug3923 | 5 ----- changes/msvc_lround | 4 ---- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b25816..58c17a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Changes in version 0.2.2.33 - 2011-09-?? + o Major bugfies: + - Avoid an assertion failure when reloading a configuration with + TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes bug + 3923; bugfix on 0.2.2.25-alpha. + + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. + + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + + Changes in version 0.2.2.32 - 2011-08-27 The Tor 0.2.2 release series is dedicated to the memory of Andreas Pfitzmann (1958-2010), a pioneer in anonymity and privacy research, diff --git a/changes/bug3898a b/changes/bug3898a deleted file mode 100644 index d40445e..0000000 --- a/changes/bug3898a +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Correct the man page to explain that HashedControlPassword and - CookieAuthentication can both be set, in which case either method - is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, - when we decided to allow these config options to both be set. Issue - raised by bug 3898. diff --git a/changes/bug3923 b/changes/bug3923 deleted file mode 100644 index 9c0e138..0000000 --- a/changes/bug3923 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfies: - - Avoid an assertion failure when reloading a configuration with - TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes - bug 3923; bugfix on 0.2.2.25-alpha. - diff --git a/changes/msvc_lround b/changes/msvc_lround deleted file mode 100644 index e4aea95..0000000 --- a/changes/msvc_lround +++ /dev/null @@ -1,4 +0,0 @@ - o Build fixes: - - Provide a substitute implementation of lround() for MSVC, which - apparently lacks it. Patch from Gisle Vanem. -

1 0

[tor/release-0.2.2] Mention that HiddenServiceDir must exist
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit cc33ac362b1e0e046ddbeae30da1810aef781e8f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 25 22:26:54 2011 +0200 Mention that HiddenServiceDir must exist --- 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 8f80c9f..bfc9766 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1339,7 +1339,7 @@ The following options are used to configure a hidden service. **HiddenServiceDir** __DIRECTORY__:: Store data files for a hidden service in DIRECTORY. Every hidden service must have a separate directory. You may use this option multiple times to - specify multiple services. + specify multiple services. DIRECTORY must be an existing directory. **HiddenServicePort** __VIRTPORT__ [__TARGET__]:: Configure a virtual port VIRTPORT for a hidden service. You may use this

1 0

[tor/release-0.2.2] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 07 Sep '11

07 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0