diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:47:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:47:25 -0500 |
| commit | 63312e0299090bb61de62cd5ed45166a70b7f698 (patch) | |
| tree | c6000d6716b0ab00b18964ea0bc52c881668797f /doc | |
| parent | 1e6ffeaeaaf3c01a85c69e9cee76f124720bb8c8 (diff) | |
| parent | aebe8a82c9a1a8ee1df9d1dbb82807d342f49203 (diff) | |
| download | tor-63312e0299090bb61de62cd5ed45166a70b7f698.tar.gz tor-63312e0299090bb61de62cd5ed45166a70b7f698.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f42ad0dd3c..6dd1b60b23 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -426,10 +426,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 |