aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 20:22:44 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 20:22:44 -0400
commit4ac8ff9c9f182b6202200480f8fc4689da659331 (patch)
treec7817f2cc0755ff989df49b85abde0763bbb4bf2 /doc
parentf2c170218238a38a0106acb1a7428b514ce979ca (diff)
parentede102fd4675af8ac4060767f0348f3c93617e80 (diff)
downloadtor-4ac8ff9c9f182b6202200480f8fc4689da659331.tar
tor-4ac8ff9c9f182b6202200480f8fc4689da659331.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 74458ab81..7d72350eb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -167,6 +167,11 @@ Other options can be specified either on the command-line (--option
Like ControlPort, but listens on a Unix domain socket, rather than a TCP
socket. (Unix and Unix-like systems only.)
+**ControlSocketsGroupWritable** **0**|**1**::
+ If this option is set to 0, don't allow the filesystem group to read and
+ write unix sockets (e.g. ControlSocket). If the option is set to 1, make
+ 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