diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-07-02 07:20:58 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-02 07:20:58 -0400 |
| commit | 8da10e8237df074194594823e6102f7bc6e811ae (patch) | |
| tree | 4db295569271e12c01326f4a7f1b30f0db29d14c | |
| parent | 0d02c053f84cbbca6c373ccea5b2174e6c62e3c4 (diff) | |
| parent | 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 (diff) | |
| download | tor-8da10e8237df074194594823e6102f7bc6e811ae.tar.gz tor-8da10e8237df074194594823e6102f7bc6e811ae.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
| -rw-r--r-- | changes/bug16016 | 4 | ||||
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 0000000000..313ef672e9 --- /dev/null +++ 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 index 80c1aa6893..96bea5a670 100644 --- 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; } |