commit df246794f374852513d6f6b3b8d90d44f4568543 Merge: 295a64dd6 8da10e823 Author: David Goulet dgoulet@torproject.org Date: Thu Jul 2 07:20:58 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

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