summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-09-24 11:17:09 -0400
committerNick Mathewson <nickm@torproject.org>2018-09-24 11:17:09 -0400
commit9767cf8cc091d0c9dd062fbfce258188841ec331 (patch)
treed55af03664ced4360db4a54bd271aef65f3214c8 /doc
parent6c739c3fb2911338d68a77ea0a90cacbd868e4d7 (diff)
parent4fd761a418558c05716b4a04a5306dc67ce53dfe (diff)
downloadtor-9767cf8cc091d0c9dd062fbfce258188841ec331.tar.gz
tor-9767cf8cc091d0c9dd062fbfce258188841ec331.zip
Merge branch 'bug26913_033'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 4ff26d83ef..406372433f 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -433,10 +433,12 @@ GENERAL OPTIONS
running.
(Default: uses the value of DataDirectory.)
-[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**::
+[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**|**auto**::
If this option is set to 0, don't allow the filesystem group to read the
CacheDirectory. If the option is set to 1, make the CacheDirectory readable
- by the default GID. (Default: 0)
+ by the default GID. If the option is "auto", then we use the
+ setting for DataDirectoryGroupReadable when the CacheDirectory is the
+ same as the DataDirectory, and 0 otherwise. (Default: auto)
[[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=**[**__ipv6address__**]**:__orport__]::
When we're unable to connect to any directory cache for directory info