nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/451' into main

Browse Source
This commit is contained in:
Alexander Færøy 2021-10-14 12:59:25 +00:00
commit d3c8008660
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40480 Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (authority, relay):
- Reject End-Of-Life relays running version 0.4.2.x, 0.4.3.x, 0.4.4.x and
0.4.5 alphas and rc. Closes ticket 40480.

8
src/feature/dirauth/process_descs.c
View File

@ -412,11 +412,11 @@ dirserv_rejects_tor_version(const char *platform,
return true;
}
/* 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. */
/* Series between Tor 0.3.6.x and 0.4.5.5-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. */
if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") &&
!tor_version_as_new_as(platform,"0.4.2.1-alpha")) {
!tor_version_as_new_as(platform,"0.4.5.6")) {
if (msg) {
*msg = please_upgrade_string;
}

14
src/test/test_process_descs.c
View File

@ -39,12 +39,20 @@ test_process_descs_versions(void *arg)
{ "Tor 0.4.1.1-alpha", true },
{ "Tor 0.4.1.4-rc", true },
{ "Tor 0.4.1.5", true },
{ "Tor 0.4.2.1-alpha", true },
{ "Tor 0.4.2.4-rc", true },
{ "Tor 0.4.2.5", true },
{ "Tor 0.4.3.0-alpha-dev", true },
{ "Tor 0.4.3.8", true },
{ "Tor 0.4.4.9", true },
{ "Tor 0.4.5.5-rc", true },
// new enough to be supported
{ "Tor 0.3.5.7", false },
{ "Tor 0.3.5.8", false },
{ "Tor 0.4.2.1-alpha", false },
{ "Tor 0.4.2.4-rc", false },
{ "Tor 0.4.3.0-alpha-dev", false },
{ "Tor 0.4.5.6", false },
{ "Tor 0.4.6.0-alpha-dev", false },
{ "Tor 0.4.6.5", false },
{ "Tor 0.4.7.0-alpha-dev", false },
// Very far in the future
{ "Tor 100.100.1.5", false },
};