diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-09 09:59:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-09 09:59:45 -0400 |
| commit | 8dd89e433078245778924ce67403673e9d35a5c3 (patch) | |
| tree | a61ed0f4d28c7ef8a0e5b749417e469468c6a7ab /doc | |
| parent | 0f39cc10f65df9fa52123eb607f5f1474c10e58b (diff) | |
| parent | 66d5292ee6a173b21e5a54a669e8e584c6781e3a (diff) | |
| download | tor-8dd89e433078245778924ce67403673e9d35a5c3.tar.gz tor-8dd89e433078245778924ce67403673e9d35a5c3.zip | |
Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7b3150e2a4..9d073635af 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1492,16 +1492,14 @@ The following options are useful only for clients (that is, if Other recognized __flags__ for a SocksPort are: **NoIPv4Traffic**;; Tell exits to not connect to IPv4 addresses in response to SOCKS - requests on this connection. (Allowing IPv4 is the default.) - **NoIPv6Traffic**;; - Tell exits to not connect to IPv6 addresses in response to SOCKS - requests on this connection. This option is only relevant when SOCKS5 - is in use, because SOCKS4 can't handle IPv6. (Allowing IPv6 is the - default.) - **NoPreferIPv6**;; + requests on this connection. + **IPv6Traffic**;; + Tell exits to allow IPv6 addresses in response to SOCKS requests on + this connection, so long as SOCKS5 is in use. (SOCKS4 can't handle + IPv6.) + **PreferIPv6**;; Tells exits that, if a host has both an IPv4 and an IPv6 address, - we would prefer to connect to it via IPv4. (IPv6 is the default in - recent versions of Tor.) + we would prefer to connect to it via IPv6. (IPv4 is the default.) **NoDNSRequest**;; Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and |