nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2011-09-02 07:23:37 -04:00
commit fe0fa91164
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug3898a Normal file
View File

@ -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.

17
doc/tor.1.txt
View File

@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option
**ControlPort** __PORT__|**auto**:: **ControlPort** __PORT__|**auto**::
If set, Tor will accept connections on this port and allow those If set, Tor will accept connections on this port and allow those
connections to control the Tor process using the Tor Control Protocol connections to control the Tor process using the Tor Control Protocol
(described in control-spec.txt). Note: unless you also specify one of (described in control-spec.txt). Note: unless you also specify one or
**HashedControlPassword** or **CookieAuthentication**, setting this more of **HashedControlPassword** or **CookieAuthentication**,
option will setting this option will cause Tor to allow any process on the local
cause Tor to allow any process on the local host to control it. This 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. 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). 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) the control socket readable and writable by the default GID. (Default: 0)
**HashedControlPassword** __hashed_password__:: **HashedControlPassword** __hashed_password__::
Don't allow any connections on the control port except when the other Allow connections on the control port if they present
process knows the password whose one-way hash is __hashed_password__. You the password whose one-way hash is __hashed_password__. You
can compute the hash of a password by running "tor --hash-password can compute the hash of a password by running "tor --hash-password
__password__". You can provide several acceptable passwords by using more __password__". You can provide several acceptable passwords by using more
than one HashedControlPassword line. than one HashedControlPassword line.
**CookieAuthentication** **0**|**1**:: **CookieAuthentication** **0**|**1**::
If this option is set to 1, don't allow any connections on the control port If this option is set to 1, allow connections on the control port
except when the connecting process knows the contents of a file named when the connecting process knows the contents of a file named
"control_auth_cookie", which Tor will create in its data directory. This "control_auth_cookie", which Tor will create in its data directory. This
authentication method should only be used on systems with good filesystem authentication method should only be used on systems with good filesystem
security. (Default: 0) security. (Default: 0)