commit 385fda038fdf53694926729d4b6f078a4b259410 Merge: 1eec42dee4 838e07be9d Author: David Goulet dgoulet@torproject.org Date: Mon Feb 1 09:24:38 2021 -0500

Merge branch 'maint-0.4.5'

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