Merge branch 'bug20487_029' into maint-0.2.9

This commit is contained in:
Nick Mathewson 2016-11-01 12:44:20 -04:00
commit 9248466f0a
2 changed files with 7 additions and 1 deletions

4
changes/bug20487 Normal file
View File

@ -0,0 +1,4 @@
o Documentation:
- Clarify that setting HiddenServiceNonAnonymousMode requires
you to also set "SOCKSPort 0". Fixes bug 20487; bugfix on
0.2.9.3-alpha.

View File

@ -2434,7 +2434,9 @@ The following options are used to configure a hidden service.
[[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**::
Makes hidden services non-anonymous on this tor instance. Allows the
non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the
server-side hidden service protocol.
server-side hidden service protocol. If you are using this option,
you need to disable all client-side services on your Tor instance,
including setting SOCKSPort to "0".
(Default: 0)
TESTING NETWORK OPTIONS