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