summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-12 16:12:15 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-12 16:12:15 -0400
commitde6f121b5984c7c2c647c785f4707cd5392b37e8 (patch)
treefdcccdbe2835b084b8ebb241016d79a9e66d5859 /doc
parentd165812416246f3b34d80904d6b253bd7eb1f4fa (diff)
downloadtor-de6f121b5984c7c2c647c785f4707cd5392b37e8.tar.gz
tor-de6f121b5984c7c2c647c785f4707cd5392b37e8.zip
Deprecate ReachableDirAddresses and ClientPreferIPv6DirPort
Closes ticket 19704.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d49dd96336..3aabffdc89 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -978,7 +978,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
@@ -1547,7 +1548,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