[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

[dgoulet at torproject.org]

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b
Merge: dbb70d85b 39830b640
Author: David Goulet <dgoulet at 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(-)