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

[nickm at torproject.org]

commit 0b2c64effd7b4c1238e3b4da34f09d670dafd52d
Merge: 4876409c2a 52e439c13e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 16:13:42 2020 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3

 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(-)