July 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 Merge: 322abd4fd 07d8d398c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 Merge: 322abd4fd 07d8d398c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 8da10e8237df074194594823e6102f7bc6e811ae Merge: 0d02c053f 5a5ff3d8c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b Merge: dbb70d85b 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 9b560ea71471b86a85c446f796b8934ea9c1bed8 Merge: 538b25241 8da10e823 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.4' changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 8da10e8237df074194594823e6102f7bc6e811ae Merge: 0d02c053f 5a5ff3d8c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b Merge: dbb70d85b 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 Merge: 322abd4fd 07d8d398c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit efac047474246ee3d8511d423807cb8518a412a9 Merge: 34ca6b133 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /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 e48675aad..c7fa86892 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; }

1 0