diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-01-30 10:56:42 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-01-30 10:56:42 -0500 |
| commit | 587c78387fac9441dad6a383055d878c6e0e30c5 (patch) | |
| tree | 6970d8d87bc21c90006ab44835a66086b75c496d | |
| parent | 06ab4d1ac11c0ea9e479839c5e29e23f6fa7dbaf (diff) | |
| parent | fbca1df9dd7691ada4837ce4deda87315c87e6a2 (diff) | |
| download | tor-587c78387fac9441dad6a383055d878c6e0e30c5.tar.gz tor-587c78387fac9441dad6a383055d878c6e0e30c5.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | changes/ticket40896 | 2 | ||||
| -rw-r--r-- | src/feature/dirauth/process_descs.c | 4 | ||||
| -rw-r--r-- | src/test/test_process_descs.c | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/changes/ticket40896 b/changes/ticket40896 new file mode 100644 index 0000000000..4f04ce71dc --- /dev/null +++ b/changes/ticket40896 @@ -0,0 +1,2 @@ + o Minor feature (authority): + - Reject 0.4.7.x series at the authority level. Closes ticket 40896.
\ No newline at end of file diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 7fd930e246..fafb781330 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -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; } diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c index c13e8b58c4..4e35d89ff2 100644 --- a/src/test/test_process_descs.c +++ b/src/test/test_process_descs.c @@ -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 }, |