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