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

[nickm at torproject.org]

commit 69bd4a8a2db6645b69a902d5ef6eb8c832f122fc
Merge: 1d11675adb 1da8621c0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:42:15 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/bug40391         | 9 +++++++++
 src/core/or/circuitmux.c | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)