aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-08-16 19:27:31 +0000
committerRoger Dingledine <arma@torproject.org>2007-08-16 19:27:31 +0000
commit2df9bb937d94697eda4af74c92e534f07278a857 (patch)
treef302566d60669483e2bfd1930e0f130ae6ac4dfb /doc
parent718953dbe97446e0c2b4b1ccae3b2be0d36473a1 (diff)
downloadtor-2df9bb937d94697eda4af74c92e534f07278a857.tar
tor-2df9bb937d94697eda4af74c92e534f07278a857.tar.gz
clean up the cookieauth stuff
svn:r11146
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 7c92fd482..5be54902e 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -166,7 +166,7 @@ compute the hash of a password by running "tor --hash-password
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
"control_auth_cookie", which Tor will create in its data directory. This
-authentication methods should only be used on systems with good filesystem
+authentication method should only be used on systems with good filesystem
security. (Default: 0)
.LP
.TP
@@ -1181,7 +1181,10 @@ recording of statistics is enabled.
.LP
.TP
.B \fIDataDirectory\fP/control_auth_cookie
-Used for cookie authentication with the controller. Regenerated on startup. See control-spec.txt for details. Only used when cookie authentication is enabled.
+Used for cookie authentication with the controller. Location can be
+overridden by the CookieAuthFile config option. Regenerated on startup.
+See control-spec.txt for details. Only used when cookie authentication
+is enabled.
.LP
.TP
.B \fIDataDirectory\fP/keys/*