Commit 587c7838 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.8' into release-0.4.8

parents 06ab4d1a fbca1df9

changes/ticket40896

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Minor feature (authority):

    - Reject 0.4.7.x series at the authority level. Closes ticket 40896.
 
 No newline at end of file

src/feature/dirauth/process_descs.c

+2 −2
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@ dirserv_rejects_tor_version(const char *platform, 
  static const char please_upgrade_string[] =

    "Tor version is insecure or unsupported. Please upgrade!";



  /* Anything before 0.4.7.0 is unsupported. Reject them. */

  if (!tor_version_as_new_as(platform,"0.4.7.0-alpha-dev")) {

  /* Anything before 0.4.8.0 is unsupported. Reject them. */

  if (!tor_version_as_new_as(platform,"0.4.8.0-alpha-dev")) {

    if (msg) {

      *msg = please_upgrade_string;

    }

src/test/test_process_descs.c

+8 −4
Original line number Diff line number Diff line
@@ -54,11 +54,15 @@ test_process_descs_versions(void *arg) 
    { "Tor 0.4.6.1-alpha", true },

    { "Tor 0.4.6.5", true },

    { "Tor 0.4.6.50", true }, /* Non existing one in the 0.4.6 series */

    { "Tor 0.4.7.0-alpha-dev", true },

    { "Tor 0.4.7.3-alpha", true },

    { "Tor 0.4.7.12", true },



    /* The 0.4.7.x series is supported. */

    { "Tor 0.4.7.0-alpha-dev", false },

    { "Tor 0.4.7.3-alpha", false },

    { "Tor 0.4.7.12", false },

    /* The 0.4.8.x series is supported. */

    { "Tor 0.4.8.0-alpha-dev", false },

    { "Tor 0.4.8.2-alpha", false },

    { "Tor 0.4.8.3-rc", false },

    { "Tor 0.4.8.12", false },



    // Very far in the future

    { "Tor 100.100.1.5", false },