commit 62cecfdc5f998afee580b7338325db803c69b827 Merge: 0968c40e36 0f8195406e Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:51:37 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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