summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-15 12:10:47 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-15 12:10:47 -0400
commit37302e64a4c53975bfb300bd46024d1eb503bd11 (patch)
tree4ab69dc47f429673c6d830107c5c1f21df58cbb2 /src/or/config.c
parentfea2d84ce3eeba1d5ef07ece390a7677401a48d7 (diff)
parentf02fd6c3af71141241137403d070d72310cbfd82 (diff)
downloadtor-37302e64a4c53975bfb300bd46024d1eb503bd11.tar.gz
tor-37302e64a4c53975bfb300bd46024d1eb503bd11.zip
Merge branch 'remove_allow_dotexit_v2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 4a1361f9f4..93a0008987 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -208,7 +208,7 @@ static config_var_t option_vars_[] = {
VAR("AccountingRule", STRING, AccountingRule_option, "max"),
V(AccountingStart, STRING, NULL),
V(Address, STRING, NULL),
- V(AllowDotExit, BOOL, "0"),
+ OBSOLETE("AllowDotExit"),
OBSOLETE("AllowInvalidNodes"),
V(AllowNonRFC953Hostnames, BOOL, "0"),
OBSOLETE("AllowSingleHopCircuits"),
@@ -684,11 +684,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." },