summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-07-24 10:11:38 +0200
committerNick Mathewson <nickm@torproject.org>2015-07-24 09:24:05 -0400
commit5be36a46cab7626c52e0c50e55ca73703698e399 (patch)
tree0d1d3a0453bda861ff274db0233a6f73c53089f3
parenta8accd55f251b9be5da7a80894e6d76b6496e1ab (diff)
downloadtor-5be36a46cab7626c52e0c50e55ca73703698e399.tar.gz
tor-5be36a46cab7626c52e0c50e55ca73703698e399.zip
Move the note about non-localhost SOCKSPort usage up to where it belongs.
I think this section slipped downwards when flags where added.
-rw-r--r--doc/tor.1.txt15
1 files changed, 7 insertions, 8 deletions
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
@@ -963,6 +963,13 @@ The following options are useful only for clients (that is, if
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
another. Recognized isolation flags are:
@@ -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.)