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

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-02 10:34:08 -04:00
commit cceb43c5e3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug24025 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (logging, relay):
- Downgrade a warning to a protocol warning in the case the ed25519 key is
not consistent between the descriptor and micro descriptor of a relay.
This can happen for instance if the relay has been flagged
NoEdConsensus. Fixes bug 24025; bugfix on 0.3.2.1-alpha.

5
src/or/nodelist.c
View File

@ -924,7 +924,10 @@ node_get_ed25519_id(const node_t *node)
if (ed25519_pubkey_eq(ri_pk, md_pk)) {
return ri_pk;
} else {
log_warn(LD_GENERAL, "Inconsistent ed25519 identities in the nodelist");
/* This can happen if the relay gets flagged NoEdConsensus which will be
* triggered on all relays of the network. Thus a protocol warning. */
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Inconsistent ed25519 identities in the nodelist");
return NULL;
}
} else if (ri_pk) {