summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 13:30:46 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-09 10:30:52 -0400
commitfea72571dfc70ec766edaaea2dc80c1e759a977d (patch)
tree8334af310ea4c2b96b570abe0d5ad2798467435d /src/or/config.c
parent2b9823b3106df2cf23e2de13ae9a9b6d12607ce4 (diff)
downloadtor-fea72571dfc70ec766edaaea2dc80c1e759a977d.tar.gz
tor-fea72571dfc70ec766edaaea2dc80c1e759a977d.zip
config: Remove AllowSingleHopCircuits option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 6edfac3976..3621b8e1f8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -207,7 +207,7 @@ static config_var_t option_vars_[] = {
V(AllowDotExit, BOOL, "0"),
OBSOLETE("AllowInvalidNodes"),
V(AllowNonRFC953Hostnames, BOOL, "0"),
- V(AllowSingleHopCircuits, BOOL, "0"),
+ OBSOLETE("AllowSingleHopCircuits"),
V(AllowSingleHopExits, BOOL, "0"),
V(AlternateBridgeAuthority, LINELIST, NULL),
V(AlternateDirAuthority, LINELIST, NULL),
@@ -662,8 +662,6 @@ 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." },
- { "AllowSingleHopCircuits", "Almost no relays actually allow single-hop "
- "exits, making this option pointless." },
{ "AllowSingleHopExits", "Turning this on will make your relay easier "
"to abuse." },
{ "ClientDNSRejectInternalAddresses", "Turning this on makes your client "