tor

commit cceb43c5e31e88535f39aa4b284c1e83ef69faa0
parent 65d22dc2f2262dfb0066bff12a0df2db97ca560b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  2 Nov 2017 10:34:08 -0400

Merge branch 'maint-0.3.2'

Diffstat:
A
changes/bug24025
 | 
5
+++++
M
src/or/nodelist.c
 | 
5
++++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug24025 b/changes/bug24025
@@ -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.
diff --git 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) {