diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-02 10:34:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-02 10:34:08 -0400 |
| commit | cceb43c5e31e88535f39aa4b284c1e83ef69faa0 (patch) | |
| tree | a28c28f835fa52d06543ffea9d0dcc91cfb7e2ea /src/or | |
| parent | 65d22dc2f2262dfb0066bff12a0df2db97ca560b (diff) | |
| parent | 0386280487fce78b73e060234f515b850af9c589 (diff) | |
| download | tor-cceb43c5e31e88535f39aa4b284c1e83ef69faa0.tar.gz tor-cceb43c5e31e88535f39aa4b284c1e83ef69faa0.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/nodelist.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f5a2cddf48..f2e979be8b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -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) { |