commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson nickm@torproject.org Date: Fri May 7 10:41:33 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.4

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