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

[nickm at torproject.org]

commit 62128193e23d4806f38bd638fc880aae9e0bd797
Merge: aceda67546 d71bf986b4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:42:14 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

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