diff options
author | David Goulet <dgoulet@torproject.org> | 2018-11-26 14:59:24 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2018-11-26 14:59:24 -0500 |
commit | 2b9a907bdccc588203d2110866d4e7bb72a25773 (patch) | |
tree | 40ce08ea30ac3392a948a0340ca1b6ccdc8c26cf | |
parent | 3741f9e524a2d3bd7239ca865d6169fd1e3dddb5 (diff) | |
parent | 056ffdec4cd10aac964ca354115ef806869afe81 (diff) | |
download | tor-2b9a907bdccc588203d2110866d4e7bb72a25773.tar.gz tor-2b9a907bdccc588203d2110866d4e7bb72a25773.zip |
Merge branch 'maint-0.3.5'
-rw-r--r-- | changes/ticket28128 | 4 | ||||
-rw-r--r-- | doc/tor.1.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket28128 b/changes/ticket28128 new file mode 100644 index 0000000000..6d08c74242 --- /dev/null +++ b/changes/ticket28128 @@ -0,0 +1,4 @@ + o Documentation (hidden service manpage, sandbox): + - Document in the man page that changing ClientOnionAuthDir value or + adding a new file in the directory will not work at runtime upon sending + a HUP if Sandbox 1. Closes ticket 28128. 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__]:: |