commit 7b102d53e3ff3c4b2a8f9fe6d583f7b2273ed001 Merge: 18654b629f 13cf964453 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 12:27:27 2021 -0500

Merge branch 'tor-gitlab/mr/265' into maint-0.4.5

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