diff options
| -rw-r--r-- | changes/ticket20575 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 | ||||
| -rw-r--r-- | src/or/config.c | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/changes/ticket20575 b/changes/ticket20575 new file mode 100644 index 0000000000..bfbf03f6b6 --- /dev/null +++ b/changes/ticket20575 @@ -0,0 +1,4 @@ + o Deprecation (config): + - Deprecate HTTPProxy/HTTPProxyAuthenticator config options. It only + applies to direct unencrypted HTTP connections to your directory server, + which your Tor probably isn't using. Fixes bug 20575. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ff9fba726b..a5cbb40cbf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -521,13 +521,14 @@ GENERAL OPTIONS [[HTTPProxy]] **HTTPProxy** __host__[:__port__]:: Tor will make all its directory requests through this host:port (or host:80 if port is not specified), rather than connecting directly to any directory - servers. + servers. (DEPRECATED: As of 0.3.1.0-alpha you should use HTTPSProxy.) [[HTTPProxyAuthenticator]] **HTTPProxyAuthenticator** __username:password__:: If defined, Tor will use this username:password for Basic HTTP proxy authentication, as in RFC 2617. This is currently the only form of HTTP proxy authentication that Tor supports; feel free to submit a patch if you - want it to support others. + want it to support others. (DEPRECATED: As of 0.3.1.0-alpha you should use + HTTPSProxyAuthenticator.) [[HTTPSProxy]] **HTTPSProxy** __host__[:__port__]:: Tor will make all its OR (SSL) connections through this host:port (or diff --git a/src/or/config.c b/src/or/config.c index 7d2ebbdd03..3413442c3c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -673,6 +673,13 @@ static const config_deprecation_t option_deprecation_notes_[] = { "easier to fingerprint, and may open you to esoteric attacks." }, /* End of options deprecated since 0.2.9.2-alpha. */ + /* Deprecated since 0.3.2.0-alpha. */ + { "HTTPProxy", "It only applies to direct unencrypted HTTP connections " + "to your directory server, which your Tor probably wasn't using." }, + { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " + "which should be used with HTTPSProxyAuthenticator." }, + /* End of options deprecated since 0.3.2.0-alpha. */ + { NULL, NULL } }; |