commit d9edf143abd05378246ebeadf0834d6ef57928fd Merge: 085bf61a35 69bd4a8a2d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.4.6' changes/bug40391 | 9 +++++++++ src/core/or/circuitmux.c | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-)