nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.7'

Browse Source
This commit is contained in:
David Goulet 2023-01-12 10:49:57 -05:00
commit 637213fce3
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40664 Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (authority):
- Reject 0.4.6.x series at the authority level. Closes ticket 40664.

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

@ -412,6 +412,15 @@ dirserv_rejects_tor_version(const char *platform,
return true;
}
/* Reject 0.4.6.x series. */
if (tor_version_as_new_as(platform, "0.4.6.0") &&
!tor_version_as_new_as(platform, "0.4.7.0-alpha-dev")) {
if (msg) {
*msg = please_upgrade_string;
}
return true;
}
return false;
}

14
src/test/test_process_descs.c
View File

@ -47,13 +47,21 @@ test_process_descs_versions(void *arg)
{ "Tor 0.4.3.0-alpha-dev", true },
{ "Tor 0.4.3.8", true },
{ "Tor 0.4.4.9", true },
/* The 0.4.5.x series stable is supported. */
{ "Tor 0.4.5.5-rc", true },
// new enough to be supported
{ "Tor 0.4.5.6", false },
{ "Tor 0.4.6.0-alpha-dev", false },
{ "Tor 0.4.6.5", false },
{ "Tor 0.4.5.15", false },
{ "Tor 0.4.6.0-alpha-dev", true },
{ "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", false },
{ "Tor 0.4.7.3-alpha", false },
{ "Tor 0.4.7.12", false },
// Very far in the future
{ "Tor 100.100.1.5", false },
};