diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-14 10:37:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-14 10:37:29 -0500 |
| commit | 9a790f7325049fdb3b48e86879cd05373cbcd1e3 (patch) | |
| tree | be6619375b3e2f2cd7414c77e89e9cd8ac38f204 /doc | |
| parent | 7918e219d45f2cac62b7c3d79fb1d4df4c5d65be (diff) | |
| parent | caf7422871f058269b6b53e279463a130a372fc1 (diff) | |
| download | tor-9a790f7325049fdb3b48e86879cd05373cbcd1e3.tar.gz tor-9a790f7325049fdb3b48e86879cd05373cbcd1e3.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cbc7ac181e..670c75d214 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2427,8 +2427,9 @@ The following options are used to configure a hidden service. servers with different IP addresses. HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set - to 1. Since a Single Onion is non-anonymous, you can not to run an - anonymous SOCKSPort on the same tor instance as a Single Onion service. + to 1. Since a Single Onion service is non-anonymous, you can not configure + a SOCKSPort on a tor instance that is running in + **HiddenServiceSingleHopMode**. (Default: 0) [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**:: |