diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-29 08:39:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-29 08:39:13 -0500 |
| commit | fd5d9d04b380b6dfee099273d729e2b7299198af (patch) | |
| tree | 27459665805220529b731488bc08814f02d844c2 | |
| parent | eda5cebd6c334c3e6fa82c6623f33592a8f77e60 (diff) | |
| parent | f785723e0b76f1b049b6103d01c316778445b33f (diff) | |
| download | tor-fd5d9d04b380b6dfee099273d729e2b7299198af.tar.gz tor-fd5d9d04b380b6dfee099273d729e2b7299198af.zip | |
Merge remote-tracking branch 'rl1987/ticket13913'
| -rw-r--r-- | changes/bug13913 | 5 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug13913 b/changes/bug13913 new file mode 100644 index 0000000000..7d908bd5b6 --- /dev/null +++ b/changes/bug13913 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 6526a89bf8..6d55a7aed1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |