[tor-commits] [tor/master] Stop checking for torrc state files generated by very old Tor versions

[nickm at torproject.org]

commit 0f31080d63d74c25ef9ae8f2df786a1bf115b187
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 24 09:10:24 2015 -0400

    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.
---
 changes/remove_old_version_checks |    3 +++
 src/or/entrynodes.c               |   16 ----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/changes/remove_old_version_checks b/changes/remove_old_version_checks
new file mode 100644
index 0000000..28cd48d
--- /dev/null
+++ b/changes/remove_old_version_checks
@@ -0,0 +1,3 @@
+  o Removed features:
+    - Tor no longer contains workarounds for stat files generated by
+      super-old versions of Tor that didn't choose guards sensibly.
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 30108b6..c21caf4 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. */