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