diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:55:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:55:14 -0400 |
| commit | db67867a81c18901b161d23696bbecf965107089 (patch) | |
| tree | fe5917dbe1a5445e8a4737b39cb5cf34a556cf7b | |
| parent | e6d84ac04fbebdbe64587b08594f42042417d92f (diff) | |
| parent | d8d6d8c2066fbc2d23f2afc965a6e9f77efecb6e (diff) | |
| download | tor-db67867a81c18901b161d23696bbecf965107089.tar.gz tor-db67867a81c18901b161d23696bbecf965107089.zip | |
Merge remote-tracking branch 'pastly/ticket20486'
| -rw-r--r-- | changes/ticket20486 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket20486 b/changes/ticket20486 new file mode 100644 index 0000000000..9c1bb1e67f --- /dev/null +++ b/changes/ticket20486 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e0438690af..bfae1c6323 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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.) |