diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-07-02 07:20:57 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-02 07:20:57 -0400 |
| commit | 07d8d398ca8961d2d9155a2df9c7ced6b382e73b (patch) | |
| tree | e56106835a77a5d0773a133b3886c963e54abfe4 | |
| parent | dbb70d85bf65d33e0a1035146d71a2a610e91056 (diff) | |
| parent | 39830b6408f8a720ce71ccb6b853663c6e6047e9 (diff) | |
| download | tor-07d8d398ca8961d2d9155a2df9c7ced6b382e73b.tar.gz tor-07d8d398ca8961d2d9155a2df9c7ced6b382e73b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -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 0cd7a76a9a..b3cf3e2394 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,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; } |