Merge remote-tracking branch 'tor-github/pr/561'

This commit is contained in:
Nick Mathewson 2018-12-05 08:29:41 -05:00
commit 4002a84ffe
2 changed files with 7 additions and 1 deletions

3
changes/doc28560 Normal file
View File

@ -0,0 +1,3 @@
o Documentation (hidden service manpage, sandbox):
- Mention that you cannot add new Onion Service if Tor is already
running with Sandbox enabled. Closes ticket 28560.

View File

@ -610,7 +610,8 @@ GENERAL OPTIONS
Logs
ServerDNSResolvConfFile
Tor must remain in client or server mode (some changes to ClientOnly and
ORPort are not allowed).
ORPort are not allowed). Launching new Onion Services through Control
Port is not supported with current syscall sandboxing implementation.
ClientOnionAuthDir and any files in it won't reload on HUP signal.
(Default: 0)
@ -2821,6 +2822,8 @@ The following options are used to configure a hidden service.
Store data files for a hidden service in DIRECTORY. Every hidden service
must have a separate directory. You may use this option multiple times to
specify multiple services. If DIRECTORY does not exist, Tor will create it.
Please note that you cannot add new Onion Service to already running Tor
instance if **Sandbox** is enabled.
(Note: in current versions of Tor, if DIRECTORY is a relative path,
it will be relative to the current
working directory of Tor instance, not to its DataDirectory. Do not