From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 24 Jul 2015 08:11:38 +0000 (+0200)
Subject: Move the note about non-localhost SOCKSPort usage up to where it belongs.
X-Git-Tag: tor-0.2.7.2-alpha~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5be36a46cab7626c52e0c50e55ca73703698e399;p=thirdparty%2Ftor.git

Move the note about non-localhost SOCKSPort usage up to where it belongs.

I think this section slipped downwards when flags where added.
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ca686281b8..3a54957f8f 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -962,6 +962,13 @@ The following options are useful only for clients (that is, if
     connections via SOCKS. Set it to "auto" to have Tor pick a port for
     you. This directive can be specified multiple times to bind
     to multiple addresses/ports. (Default: 9050) +
+ +
+        NOTE: Although this option allows you to specify an IP address
+        other than localhost, you should do so only with extreme caution.
+        The SOCKS protocol is unencrypted and (as we use it)
+        unauthenticated, so exposing it in this way could leak your
+        information to anybody watching your network, and allow anybody
+        to use your computer as an open proxy. +
  +
     The _isolation flags_ arguments give Tor rules for which streams
     received on this SOCKSPort are allowed to share circuits with one
@@ -1003,14 +1010,6 @@ The following options are useful only for clients (that is, if
     **PreferIPv6**;;
         Tells exits that, if a host has both an IPv4 and an IPv6 address,
         we would prefer to connect to it via IPv6. (IPv4 is the default.) +
- +
-        NOTE: Although this option allows you to specify an IP address
-        other than localhost, you should do so only with extreme caution.
-        The SOCKS protocol is unencrypted and (as we use it)
-        unauthenticated, so exposing it in this way could leak your
-        information to anybody watching your network, and allow anybody
-        to use your computer as an open proxy. +
- +
     **CacheIPv4DNS**;;
         Tells the client to remember IPv4 DNS answers we receive from exit
         nodes via this connection. (On by default.)