commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson nickm@torproject.org Date: Fri May 7 10:41:34 2021 -0400

Merge branch 'maint-0.4.4' into maint-0.4.5

changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)