Merge remote-tracking branch 'tor-github/pr/1938/head'

changes/bug34357

@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+    - Directory authorities now reject descriptors from relays running
+      Tor versions from the 0.4.1 series, but still allow the 0.3.5
+      series. Resolves ticket 34357. Patch by Neel Chauhan.

src/feature/dirauth/process_descs.c

@@ -409,11 +409,11 @@ dirserv_rejects_tor_version(const char *platform,
     return true;
   }
 
-  /* Series between Tor 0.3.6 and 0.4.1.4-rc inclusive are unsupported.
-   * Reject them. 0.3.6.0-alpha-dev only existed for a short time, before
-   * it was renamed to 0.4.0.0-alpha-dev. */
+  /* Series between Tor 0.3.6 and 0.4.1 inclusive are unsupported. Reject
+   * them. 0.3.6.0-alpha-dev only existed for a short time, before it was
+   * renamed to 0.4.0.0-alpha-dev. */
   if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") &&
-      !tor_version_as_new_as(platform,"0.4.1.5")) {
+      !tor_version_as_new_as(platform,"0.4.2.1-alpha")) {
     if (msg) {
       *msg = please_upgrade_string;
     }

src/test/test_process_descs.c

@@ -38,10 +38,10 @@ test_process_descs_versions(void *arg)
     { "Tor 0.4.0.5", true },
     { "Tor 0.4.1.1-alpha", true },
     { "Tor 0.4.1.4-rc", true },
+    { "Tor 0.4.1.5", true },
     // new enough to be supported
     { "Tor 0.3.5.7", false },
     { "Tor 0.3.5.8", false },
-    { "Tor 0.4.1.5", false },
     { "Tor 0.4.2.1-alpha", false },
     { "Tor 0.4.2.4-rc", false },
     { "Tor 0.4.3.0-alpha-dev", false },