tor

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9
parent 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu,  2 Jul 2020 07:20:57 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

Diffstat:
A
changes/bug16016
 | 
4
++++
M
src/feature/nodelist/routerlist.c
 | 
6
+++++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug16016 b/changes/bug16016
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Downgrade a noisy log message that could occur naturally when
+      receiving an extrainfo document that we no longer want.
+      Fixes bug 16016; bugfix on 0.2.6.3-alpha.
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
@@ -1088,7 +1088,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible))
      * This just won't work. */;
     static ratelim_t no_sd_ratelim = RATELIM_INIT(1800);
     r = ROUTER_BAD_EI;
-    log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG,
+    /* This is a DEBUG because it can happen naturally, if we tried
+     * to add an extrainfo for which we no longer have the
+     * corresponding routerinfo.
+     */
+    log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR,
                    "No entry found in extrainfo map.");
     goto done;
   }