浏览代码

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

I think this section slipped downwards when flags where added.
Linus Nordberg 10 年之前
父节点
当前提交
5be36a46ca
共有 1 个文件被更改,包括 7 次插入8 次删除
  1. 7 8
      doc/tor.1.txt

+ 7 - 8
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
     connections via SOCKS. Set it to "auto" to have Tor pick a port for
     you. This directive can be specified multiple times to bind
     you. This directive can be specified multiple times to bind
     to multiple addresses/ports. (Default: 9050) +
     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
     The _isolation flags_ arguments give Tor rules for which streams
     received on this SOCKSPort are allowed to share circuits with one
     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**;;
     **PreferIPv6**;;
         Tells exits that, if a host has both an IPv4 and an IPv6 address,
         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.) +
         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**;;
     **CacheIPv4DNS**;;
         Tells the client to remember IPv4 DNS answers we receive from exit
         Tells the client to remember IPv4 DNS answers we receive from exit
         nodes via this connection. (On by default.)
         nodes via this connection. (On by default.)