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

[dgoulet at torproject.org]

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9
Merge: 322abd4fd 07d8d398c
Author: David Goulet <dgoulet at 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(-)