diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:44:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-01 12:44:20 -0400 |
| commit | 9248466f0a020e661cad185fc8eec28a18aca36c (patch) | |
| tree | f080376b30c03bbe2a9d7a55e22609f382da3088 /doc | |
| parent | e712b5d784db912f7924f090b918888125aa6bcf (diff) | |
| parent | b858452f944e33b175e1ef16bf94b35dcf64bf31 (diff) | |
| download | tor-9248466f0a020e661cad185fc8eec28a18aca36c.tar.gz tor-9248466f0a020e661cad185fc8eec28a18aca36c.zip | |
Merge branch 'bug20487_029' into maint-0.2.9
Diffstat (limited to 'doc')
| -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 9d8b631e35..b502e447d0 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 |