Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-11-14 10:37:22 -05:00
commit c290053ac7
1 changed files with 3 additions and 2 deletions

View File

@ -2427,8 +2427,9 @@ The following options are used to configure a hidden service.
servers with different IP addresses. servers with different IP addresses.
HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set
to 1. Since a Single Onion is non-anonymous, you can not to run an to 1. Since a Single Onion service is non-anonymous, you can not configure
anonymous SOCKSPort on the same tor instance as a Single Onion service. a SOCKSPort on a tor instance that is running in
**HiddenServiceSingleHopMode**.
(Default: 0) (Default: 0)
[[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**:: [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**::