Browse Source

Merge remote-tracking branch 'rl1987/ticket13913'

Nick Mathewson 9 years ago
parent
commit
fd5d9d04b3
2 changed files with 7 additions and 0 deletions
  1. 5 0
      changes/bug13913
  2. 2 0
      doc/tor.1.txt

+ 5 - 0
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.

+ 2 - 0
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