commit 9eedfefc3d7e28c32533e79ca16ecfeeb5c6ac90 Merge: be17fa169 5a5ff3d8c Author: David Goulet dgoulet@torproject.org Date: Thu Jul 2 07:20:58 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)