commit 36b51a1c716200c65f5bb9f233c461208a8d924c Merge: b2434d30d2 0f8195406e Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:51:37 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

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