diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-22 08:31:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-22 08:31:46 -0400 |
| commit | 54bfbc08ce2d756c3f40549dd9e7ae4222e34c20 (patch) | |
| tree | cd709cf6fb03a985e39c8f0454d74c7a95844002 | |
| parent | 480aa722c56ea9da9cb7400de5934bed012758a8 (diff) | |
| parent | 6e5486b11ac113ab7cf42d167dd5555b5916ddbc (diff) | |
| download | tor-54bfbc08ce2d756c3f40549dd9e7ae4222e34c20.tar.gz tor-54bfbc08ce2d756c3f40549dd9e7ae4222e34c20.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug20509 | 5 | ||||
| -rw-r--r-- | src/or/dirserv.c | 11 |
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 fa3938b5ec..fedbe51b4c 100644 --- 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) |