diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:49:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:49:13 -0400 |
| commit | e6d84ac04fbebdbe64587b08594f42042417d92f (patch) | |
| tree | fe7961cda34c3e616702d6f0f16b6122faf36736 /doc/tor.1.txt | |
| parent | 68a27dad4368b661f5b05d7660f6a96d03c7ea48 (diff) | |
| parent | 9248466f0a020e661cad185fc8eec28a18aca36c (diff) | |
| download | tor-e6d84ac04fbebdbe64587b08594f42042417d92f.tar.gz tor-e6d84ac04fbebdbe64587b08594f42042417d92f.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 221c798257..e0438690af 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |