commit 916d53d6ceab5b3a5d567f18a2bce8543d008a89 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 18 13:03:21 2014 -0400

Mark StrictE{ntry,xit}Nodes as obsolete. --- changes/bug12226 | 4 ++++ src/or/config.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug12226 b/changes/bug12226 new file mode 100644 index 0000000..0058b83 --- /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 ba9c944..92bd495 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"),