[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6

[nickm at torproject.org]

commit 18acf43175e7eb9164c4e2baaee7304347fae491
Merge: 8222f2f3ee 5acf18bfaa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 10:41:34 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/bug40380         | 3 +++
 src/core/or/circuituse.c | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)