summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-22 08:32:18 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-22 08:32:18 -0400
commit90894c87a542c8671b4fb13d8e088e1e5c89d9b6 (patch)
tree1e6717c984bbf36db88d6b4510be37f8f6cfbe65
parent0698a0beca8387e2d365fd0cd5801ecc4f910de3 (diff)
parent5c52d3c2c05a42c9535789d335a51f09a7855d68 (diff)
downloadtor-90894c87a542c8671b4fb13d8e088e1e5c89d9b6.tar.gz
tor-90894c87a542c8671b4fb13d8e088e1e5c89d9b6.zip
Merge branch 'maint-0.3.0'
-rw-r--r--changes/bug205095
-rw-r--r--src/or/dirserv.c11
2 files changed, 16 insertions, 0 deletions
diff --git a/changes/bug20509 b/changes/bug20509
new file mode 100644
index 0000000000..a39ca9f60b
--- /dev/null
+++ 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
index 2b10a09ead..1441d64506 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -398,6 +398,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)