commit 1a50657e83e8c4f441f081a0c25d85d23a9d5630 Merge: 7d833ee33 07d8d398c Author: David Goulet dgoulet@torproject.org Date: Thu Jul 2 07:20:57 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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