commit bf80465d86832c6ae2faf582d5ada18371b51370 Merge: a5b4ee2a01 98590621bb Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:51:36 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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