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

Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5

Browse Source
This commit is contained in:
George Kadianakis 2021-02-12 13:44:03 +02:00
commit 58b5300f44
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug40281 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (logging):
- Avoid a spurious log message about missing subprotocol versions, when
the consensus that we're reading from is older than the current
release. . Previously we had made this message nonfatal in this case,
but in practice, it is never relevant when the consensus is older than
the current release. Fixes bug 40281; bugfix on 0.4.0.1-alpha.

9
src/feature/nodelist/networkstatus.c
View File

@ -2723,6 +2723,13 @@ networkstatus_check_required_protocols(const networkstatus_t *ns,
const bool consensus_postdates_this_release =
ns->valid_after >= tor_get_approx_release_date();
if (! consensus_postdates_this_release) {
// We can't meaningfully warn about this case: This consensus is from
// before we were released, so whatever is says about required or
// recommended versions may no longer be true.
return 0;
}
tor_assert(warning_out);
if (client_mode) {
@ -2740,7 +2747,7 @@ networkstatus_check_required_protocols(const networkstatus_t *ns,
"%s on the Tor network. The missing protocols are: %s",
func, missing);
tor_free(missing);
return consensus_postdates_this_release ? 1 : 0;
return 1;
}
if (! protover_all_supported(recommended, &missing)) {