summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 09:11:49 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-19 14:14:17 -0400
commit3f807ec05866d0438d81c252ac43946cabd23233 (patch)
treef0fd8a23442f92a7d2c0775d0db4a1024da2bd6f /src
parent91dd4a00f7d4891e24187a849933547128aeeb9f (diff)
downloadtor-3f807ec05866d0438d81c252ac43946cabd23233.tar.gz
tor-3f807ec05866d0438d81c252ac43946cabd23233.zip
config: Deprecate HTTPProxy option
Move the HTTPProxy option to the deprecated list so for now it will only warn users but feature is still in the code which will be removed in a future stable version. Fixes #20575 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index a73f397073..5fda820d15 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -693,6 +693,13 @@ static const config_deprecation_t option_deprecation_notes_[] = {
"NoAdvertise sub-option" },
/* End of options deprecated since 0.2.9.2-alpha. */
+ /* Deprecated since 0.3.1.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.1.0-alpha. */
+
{ NULL, NULL }
};