summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-15 09:18:24 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-15 09:18:24 -0400
commitc9899ee64008b63cb9867115ac684590dd50f902 (patch)
treec888e23a31dea5caa5479c6ce152fb5169e6101f /doc
parent4b02af452d12b35e58d3a8e5e7ef042970e26774 (diff)
parentd8626d34e59ceb1a71b23646b9c1c1f4fec88638 (diff)
downloadtor-c9899ee64008b63cb9867115ac684590dd50f902.tar.gz
tor-c9899ee64008b63cb9867115ac684590dd50f902.zip
Merge remote-tracking branch 'weasel/bug18458'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d6a68523df..a71b04fec7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -321,6 +321,9 @@ GENERAL OPTIONS
**WorldWritable**;;
Unix domain sockets only: makes the socket get created as
world-writable.
+ **RelaxDirModeCheck**;;
+ Unix domain sockets only: Do not insist that the directory
+ that holds the socket be read-restricted.
[[ControlListenAddress]] **ControlListenAddress** __IP__[:__PORT__]::
Bind the controller listener to this address. If you specify a port, bind