commit 0e7c82f7ba3cde730abaf7b451a0946f95d0a6f8 Merge: 9cfbb45487 838e07be9d Author: David Goulet dgoulet@torproject.org Date: Mon Feb 1 09:24:38 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

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