Merge remote-tracking branch 'rl1987/ticket13913'

This commit is contained in:
Nick Mathewson 2014-12-29 08:39:13 -05:00
commit fd5d9d04b3
2 changed files with 7 additions and 0 deletions

5
changes/bug13913 Normal file
View File

@ -0,0 +1,5 @@
o Documentation:
- Clarify HiddenServiceDir option description in manpage to make it
clear that directory in question is relative to current working
directory of Tor instance if it is defined as a relative path. Fixes
issue 13913.

View File

@ -2032,6 +2032,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. DIRECTORY must be an existing directory.
NB: if DIRECTORY is defined in relative way, it will be relative to current
working directory of Tor instance, not it's DataDirectory.
[[HiddenServicePort]] **HiddenServicePort** __VIRTPORT__ [__TARGET__]::
Configure a virtual port VIRTPORT for a hidden service. You may use this