Merge remote-tracking branch 'pastly/ticket20486'

This commit is contained in:
Nick Mathewson 2016-11-01 12:55:14 -04:00
commit db67867a81
2 changed files with 5 additions and 2 deletions

3
changes/ticket20486 Normal file
View File

@ -0,0 +1,3 @@
o Documentation (Onion Services):
- tor's man page incorrectly states that HiddenServiceDir must already
exist. This is not true. Fixes 20486.

View File

@ -2334,9 +2334,9 @@ The following options are used to configure a hidden service.
[[HiddenServiceDir]] **HiddenServiceDir** __DIRECTORY__::
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.
specify multiple services. If DIRECTORY does not exist, Tor will create it.
(Note: in current versions of Tor, if DIRECTORY is a relative path,
it will be relative to current
it will be relative to the current
working directory of Tor instance, not to its DataDirectory. Do not
rely on this behavior; it is not guaranteed to remain the same in future
versions.)