commit 6dc3423e3ebd7ab10647b54b87584764349f4a50 Merge: d6816de3e0 e2c1ac214c Author: Nick Mathewson nickm@torproject.org Date: Fri May 7 10:41:33 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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