commit 5484a9db78a236e8537d33b7bfc1ec09cab3e96b Merge: 3e618aae1a 36b51a1c71 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:51:37 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

src/core/or/connection_edge.c | 12 ++++++++++++ src/feature/nodelist/nodelist.c | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)