diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-19 14:16:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-19 14:16:21 -0400 |
| commit | e01e4e0146a4618678b5ec8003e0f8a798b592e7 (patch) | |
| tree | 85f8ff8b0bfc8ddeb034a269471ffeffe4a97ae9 /src/or/config.c | |
| parent | bf95d678e86598c5200417e96d4d4069ace8b851 (diff) | |
| parent | 0379439fe89f7951415659b5fe2136e2a7fdc6ee (diff) | |
| download | tor-e01e4e0146a4618678b5ec8003e0f8a798b592e7.tar.gz tor-e01e4e0146a4618678b5ec8003e0f8a798b592e7.zip | |
Merge branch 'ticket20575_031_01_squashed'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 } }; |