commit 0f8195406e0a2a97a3167d4bb40484f4bd091289 Merge: 705fd37875 98590621bb Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:51:36 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

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