nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3' into maint-0.4.4

Browse Source
This commit is contained in:
David Goulet 2020-07-02 07:20:58 -04:00
commit 8da10e8237
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug16016 Normal file
View File

@ -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.

6
src/feature/nodelist/routerlist.c
View File

@ -1088,7 +1088,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible))
* This just won't work. */; * This just won't work. */;
static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); static ratelim_t no_sd_ratelim = RATELIM_INIT(1800);
r = ROUTER_BAD_EI; 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."); "No entry found in extrainfo map.");
goto done; goto done;
} }