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 remote-tracking branch 'tor-github/pr/1938/head'

Browse Source
This commit is contained in:
Nick Mathewson 2020-07-06 09:34:13 -04:00
commit ac3bc88343
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug34357 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (directory authorities):
- Directory authorities now reject descriptors from relays running
Tor versions from the 0.4.1 series, but still allow the 0.3.5
series. Resolves ticket 34357. Patch by Neel Chauhan.

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

@ -409,11 +409,11 @@ dirserv_rejects_tor_version(const char *platform,
return true; return true;
} }
/* Series between Tor 0.3.6 and 0.4.1.4-rc inclusive are unsupported. /* Series between Tor 0.3.6 and 0.4.1 inclusive are unsupported. Reject
* Reject them. 0.3.6.0-alpha-dev only existed for a short time, before * them. 0.3.6.0-alpha-dev only existed for a short time, before it was
* it was renamed to 0.4.0.0-alpha-dev. */ * renamed to 0.4.0.0-alpha-dev. */
if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") && if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") &&
!tor_version_as_new_as(platform,"0.4.1.5")) { !tor_version_as_new_as(platform,"0.4.2.1-alpha")) {
if (msg) { if (msg) {
*msg = please_upgrade_string; *msg = please_upgrade_string;
} }

2
src/test/test_process_descs.c
View File

@ -38,10 +38,10 @@ test_process_descs_versions(void *arg)
{ "Tor 0.4.0.5", true }, { "Tor 0.4.0.5", true },
{ "Tor 0.4.1.1-alpha", true }, { "Tor 0.4.1.1-alpha", true },
{ "Tor 0.4.1.4-rc", true }, { "Tor 0.4.1.4-rc", true },
{ "Tor 0.4.1.5", true },
// new enough to be supported // new enough to be supported
{ "Tor 0.3.5.7", false }, { "Tor 0.3.5.7", false },
{ "Tor 0.3.5.8", false }, { "Tor 0.3.5.8", false },
{ "Tor 0.4.1.5", false },
{ "Tor 0.4.2.1-alpha", false }, { "Tor 0.4.2.1-alpha", false },
{ "Tor 0.4.2.4-rc", false }, { "Tor 0.4.2.4-rc", false },
{ "Tor 0.4.3.0-alpha-dev", false }, { "Tor 0.4.3.0-alpha-dev", false },