diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-18 15:02:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-18 15:02:16 -0400 |
| commit | 94a88eaa45adfb05359ceed99aea572f9b123974 (patch) | |
| tree | 7a00a270c271ff2d49d3f8df594bf1e2d6bf6ed9 /doc | |
| parent | 3c9ff0af96835575af942a367726732366977581 (diff) | |
| parent | de6f121b5984c7c2c647c785f4707cd5392b37e8 (diff) | |
| download | tor-94a88eaa45adfb05359ceed99aea572f9b123974.tar.gz tor-94a88eaa45adfb05359ceed99aea572f9b123974.zip | |
Merge remote-tracking branch 'public/ticket19704'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4b33e1b477..5e0b76d4a0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1008,7 +1008,8 @@ The following options are useful only for clients (that is, if these restrictions when fetching directory information, using standard HTTP GET requests. If not set explicitly then the value of **ReachableAddresses** is used. If **HTTPProxy** is set then these - connections will go through that proxy. + connections will go through that proxy. (DEPRECATED: This option has + had no effect for some time.) [[ReachableORAddresses]] **ReachableORAddresses** __ADDR__[/__MASK__][:__PORT__]...:: Like **ReachableAddresses**, a list of addresses and ports. Tor will obey @@ -1571,7 +1572,8 @@ The following options are useful only for clients (that is, if server has both. (Tor also prefers an IPv6 DirPort if IPv4Client is set to 0.) If this option is set to auto, clients prefer IPv4. Other things may influence the choice. This option breaks a tie to the favor of IPv6. - (Default: auto) + (Default: auto) (DEPRECATED: This option has had no effect for some + time.) [[ClientPreferIPv6ORPort]] **ClientPreferIPv6ORPort** **0**|**1**|**auto**:: If this option is set to 1, Tor prefers an OR port with an IPv6 |