[tor-commits] [tor/master] Be more lenient in our fix for bug 11149

[arma at torproject.org]

commit ddaeb4deee7b2a7772baac9a09abc54b689d8437
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Mar 23 02:53:08 2014 -0400

    Be more lenient in our fix for bug 11149
    
    There are still quite a few 0.2.3.2x relays running for x<5, and while I
    agree they should upgrade, I don't think cutting them out of the network
    is a net win on either side.
---
 changes/require_023 |    4 ++--
 src/or/dirserv.c    |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changes/require_023 b/changes/require_023
index 95302e1..f3a5a14 100644
--- a/changes/require_023
+++ b/changes/require_023
@@ -1,6 +1,6 @@
   o Deprecated versions:
     - Tor 0.2.2.x is no longer supported, and has not been for a while.
-      Directory authorities will stop accepting descriptors from
-      Tor relays running any version of Tor prior to Tor 0.2.3.25.
+      Directory authorities no longer accept descriptors from
+      Tor relays running any version of Tor prior to Tor 0.2.3.16-alpha.
       Resolves ticket 11149.
 
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 234209d..19ed12d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -374,9 +374,9 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
               strmap_size(fingerprint_list->fp_by_name),
               digestmap_size(fingerprint_list->status_by_digest));
 
-  /* Versions before Tor 0.2.3.25 are too old to support, and aren't
-   * getting any more security fixes. Disable them. */
-  if (platform && !tor_version_as_new_as(platform,"0.2.3.25")) {
+  /* Versions before Tor 0.2.3.16-alpha are too old to support, and are
+   * missing some important security fixes too. Disable them. */
+  if (platform && !tor_version_as_new_as(platform,"0.2.3.16-alpha")) {
     if (msg)
       *msg = "Tor version is insecure or unsupported. Please upgrade!";
     return FP_REJECT;