[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

commit a4c8591c351358e18897f038efbea27cfd295ce6
Merge: 1c9890bd31 5acf18bfaa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 10:41:34 2021 -0400

    Merge branch 'maint-0.4.6'

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