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

[nickm at torproject.org]

commit d71bf986b4faf7cb3b654192bc67d5b674cfcf02
Merge: 7fdfc2ea54 4c06c619fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:41:59 2021 -0400

    Merge branch 'bug40391_035' into maint-0.3.5

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