summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-09 08:02:36 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-09 08:02:36 -0500
commitce3d5da0d20361dbcaf0c5bc277d95e6706cd955 (patch)
treeae2f56e8e313c36f3d874becbd64e7889868c147 /src
parent23820a39439637f401b24085dfe7a703dee88c43 (diff)
parent40c64f45f04a7cc1ec0149b6c8e8805fba9a2259 (diff)
downloadtor-ce3d5da0d20361dbcaf0c5bc277d95e6706cd955.tar.gz
tor-ce3d5da0d20361dbcaf0c5bc277d95e6706cd955.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 252d50944b..23d67ca42f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -694,11 +694,6 @@ static const config_var_t testing_tor_network_defaults[] = {
#undef OBSOLETE
static const config_deprecation_t option_deprecation_notes_[] = {
- /* Deprecated since 0.2.9.2-alpha... */
- { "AllowDotExit", "Unrestricted use of the .exit notation can be used for "
- "a wide variety of application-level 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." },