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

[nickm at torproject.org]

commit 4234a9d81910812f57796087d4d12bf357219666
Merge: 2ec66e346b 0b2c64effd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 16:13:43 2020 -0500

    Merge branch 'maint-0.4.3' into release-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(-)