tor

commit 5c52d3c2c05a42c9535789d335a51f09a7855d68
parent d1340bd5ac905e650dfdad53aeba0361231def16
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 22 May 2017 08:32:07 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

Diffstat:
A
changes/bug20509
 | 
5
+++++
M
src/or/dirserv.c
 | 
11
+++++++++++

2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/changes/bug20509 b/changes/bug20509
@@ -0,0 +1,5 @@
+  o Minor features:
+    - Directory authorities now reject relays running versions
+      0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
+      suffer from bug 20499 and don't keep their consensus cache
+      up-to-date. Resolves ticket 20509.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
@@ -383,6 +383,17 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
     return FP_REJECT;
   }
 
+  /* Tor 0.2.9.x where x<5 suffers from bug #20499, where relays don't
+   * keep their consensus up to date so they make bad guards.
+   * The simple fix is to just drop them from the network. */
+  if (platform &&
+      tor_version_as_new_as(platform,"0.2.9.0-alpha") &&
+      !tor_version_as_new_as(platform,"0.2.9.5-alpha")) {
+    if (msg)
+      *msg = "Tor version contains bug 20499. Please upgrade!";
+    return FP_REJECT;
+  }
+
   status_by_digest = digestmap_get(fingerprint_list->status_by_digest,
                                    id_digest);
   if (status_by_digest)