commit 906d1b24f0c2527f60700d61f6f7ce2177b5c2b0 Merge: 346cfbabe7 7b102d53e3 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 12:27:33 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/bug32666 | 3 +++ src/core/or/circuitbuild.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)