commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson nickm@torproject.org Date: Fri May 7 10:41:34 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

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