Commit 50b564da authored by nonameformee's avatar nonameformee
Browse files

dirauth: Reject 0.4.7.x series at the authority level

parent 82e73df8

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/dirauth_options.inc

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ CONF_VAR(RecommendedClientVersions, LINELIST, 0, NULL) 
CONF_VAR(RecommendedServerVersions, LINELIST, 0, NULL)



/** Which minimal version of tor do we accept relay descriptors from? */

CONF_VAR(MinimalAcceptedServerVersion, STRING, 0, "0.4.7.0-alpha-dev")

CONF_VAR(MinimalAcceptedServerVersion, STRING, 0, "0.4.8.0-alpha-dev")



/** Relays which should be voted Guard regardless of uptime and bandwidth. */

CONF_VAR(AuthDirVoteGuard, ROUTERSET, 0, NULL)

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 },