[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit ec9d646923bb32eb9dedd71a854031bf1fca87e3
Merge: 55b8eedba8 52e439c13e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 16:13:42 2020 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug40080           |  6 ++++++
 src/core/or/channel.c      |  2 +-
 src/core/or/channel.h      |  3 +++
 src/core/or/circuitbuild.c | 24 ++++++++++++++++++++----
 4 files changed, 30 insertions(+), 5 deletions(-)