summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-11-26 14:59:24 -0500
committerDavid Goulet <dgoulet@torproject.org>2018-11-26 14:59:24 -0500
commit2b9a907bdccc588203d2110866d4e7bb72a25773 (patch)
tree40ce08ea30ac3392a948a0340ca1b6ccdc8c26cf /doc/tor.1.txt
parent3741f9e524a2d3bd7239ca865d6169fd1e3dddb5 (diff)
parent056ffdec4cd10aac964ca354115ef806869afe81 (diff)
downloadtor-2b9a907bdccc588203d2110866d4e7bb72a25773.tar.gz
tor-2b9a907bdccc588203d2110866d4e7bb72a25773.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b147ad68aa..c951b63395 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -611,6 +611,7 @@ GENERAL OPTIONS
ServerDNSResolvConfFile
Tor must remain in client or server mode (some changes to ClientOnly and
ORPort are not allowed).
+ ClientOnionAuthDir and any files in it won't reload on HUP signal.
(Default: 0)
[[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]::