diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-03-24 09:10:24 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-03-24 09:24:12 -0400 |
commit | 0f31080d63d74c25ef9ae8f2df786a1bf115b187 (patch) | |
tree | f48becb6bee85ab5f548acb635c904c3da255de0 /src/or/entrynodes.c | |
parent | 190ed66b06833bcf3016e93f1c4ad98d1ebdb98d (diff) | |
download | tor-0f31080d63d74c25ef9ae8f2df786a1bf115b187.tar.gz tor-0f31080d63d74c25ef9ae8f2df786a1bf115b187.zip |
Stop checking for torrc state files generated by very old Tor versions
These haven't worked in so long that if you had a state file of this
kind, the guards in it would be so old that you wouldn't use them
anyway.
Diffstat (limited to 'src/or/entrynodes.c')
-rw-r--r-- | src/or/entrynodes.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 30108b6041..c21caf41f0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -571,22 +571,6 @@ remove_obsolete_entry_guards(time_t now) } else if (tor_version_parse(ver, &v)) { msg = "does not seem to be from any recognized version of Tor"; version_is_bad = 1; - } else { - char *tor_ver = NULL; - tor_asprintf(&tor_ver, "Tor %s", ver); - if ((tor_version_as_new_as(tor_ver, "0.1.0.10-alpha") && - !tor_version_as_new_as(tor_ver, "0.1.2.16-dev")) || - (tor_version_as_new_as(tor_ver, "0.2.0.0-alpha") && - !tor_version_as_new_as(tor_ver, "0.2.0.6-alpha")) || - /* above are bug 440; below are bug 1217 */ - (tor_version_as_new_as(tor_ver, "0.2.1.3-alpha") && - !tor_version_as_new_as(tor_ver, "0.2.1.23")) || - (tor_version_as_new_as(tor_ver, "0.2.2.0-alpha") && - !tor_version_as_new_as(tor_ver, "0.2.2.7-alpha"))) { - msg = "was selected without regard for guard bandwidth"; - version_is_bad = 1; - } - tor_free(tor_ver); } if (!version_is_bad && entry->chosen_on_date + guard_lifetime < now) { /* It's been too long since the date listed in our state file. */ |