From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Aug 2014 17:03:21 +0000 (-0400)
Subject: Mark StrictE{ntry,xit}Nodes as obsolete.
X-Git-Tag: tor-0.2.6.1-alpha~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916d53d6ceab5b3a5d567f18a2bce8543d008a89;p=thirdparty%2Ftor.git

Mark StrictE{ntry,xit}Nodes as obsolete.
---

diff --git a/changes/bug12226 b/changes/bug12226
new file mode 100644
index 0000000000..0058b838cd
--- /dev/null
+++ b/changes/bug12226
@@ -0,0 +1,4 @@
+  o Removed features:
+    - The old "StrictEntryNodes" and "StrictExitNodes" options, which
+      used to be deprecated synonyms for "StrictNodes", are now marked
+      obsolete.  Resolves ticket 12226.
diff --git a/src/or/config.c b/src/or/config.c
index ba9c944f56..92bd495471 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -99,8 +99,6 @@ static config_abbrev_t option_abbrevs_[] = {
   { "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
   { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0},
   { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
-  { "StrictEntryNodes", "StrictNodes", 0, 1},
-  { "StrictExitNodes", "StrictNodes", 0, 1},
   { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0},
   { "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1},
   { NULL, NULL, 0, 0},
@@ -400,6 +398,8 @@ static config_var_t option_vars_[] = {
   V(SocksTimeout,                INTERVAL, "2 minutes"),
   V(SSLKeyLifetime,              INTERVAL, "0"),
   OBSOLETE("StatusFetchPeriod"),
+  OBSOLETE("StrictEntryNodes"),
+  OBSOLETE("StrictExitNodes"),
   V(StrictNodes,                 BOOL,     "0"),
   V(Support022HiddenServices,    AUTOBOOL, "auto"),
   OBSOLETE("SysLog"),