mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/ticket19704'

Browse source
This commit is contained in:
Nick Mathewson 2017-09-18 15:02:16 -04:00
commit 94a88eaa45
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/ticket19704 Normal file
View file

@ -0,0 +1,5 @@
o Deprecated features:
- The ReachableDirAddresses and ClientPreferIPv6DirPort options
are now deprecated; they do not apply to relays, and they
have had no effect on clients since 0.2.8.x. Closes ticket 19704.

6
doc/tor.1.txt
View file

@ -1008,7 +1008,8 @@ The following options are useful only for clients (that is, if
these restrictions when fetching directory information, using standard HTTP these restrictions when fetching directory information, using standard HTTP
GET requests. If not set explicitly then the value of GET requests. If not set explicitly then the value of
**ReachableAddresses** is used. If **HTTPProxy** is set then these **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__]...:: [[ReachableORAddresses]] **ReachableORAddresses** __ADDR__[/__MASK__][:__PORT__]...::
Like **ReachableAddresses**, a list of addresses and ports. Tor will obey 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 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 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. 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**:: [[ClientPreferIPv6ORPort]] **ClientPreferIPv6ORPort** **0**|**1**|**auto**::
If this option is set to 1, Tor prefers an OR port with an IPv6 If this option is set to 1, Tor prefers an OR port with an IPv6

4
src/or/config.c
View file

@ -689,6 +689,10 @@ static const config_deprecation_t option_deprecation_notes_[] = {
"to your directory server, which your Tor probably wasn't using." }, "to your directory server, which your Tor probably wasn't using." },
{ "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy "
"which should be used with HTTPSProxyAuthenticator." }, "which should be used with HTTPSProxyAuthenticator." },
{ "ReachableDirAddresses", "It has no effect on relays, and has had no "
"effect on clients since 0.2.8." },
{ "ClientPreferIPv6DirPort", "It has no effect on relays, and has had no "
"effect on clients since 0.2.8." },
/* End of options deprecated since 0.3.2.0-alpha. */ /* End of options deprecated since 0.3.2.0-alpha. */
{ NULL, NULL } { NULL, NULL }