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

[nickm at torproject.org]

commit 8a561fc5bfc48b3d849d62b266d323f98d509a50
Merge: b5a88e8d47 84a5bd48e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:05:40 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40081        |  6 ++++++
 src/core/or/channel.c      | 44 ++++++--------------------------------------
 src/core/or/channel.h      |  9 +++------
 src/core/or/channeltls.c   | 32 ++++++++++----------------------
 src/core/or/circuitbuild.c |  2 ++
 src/test/test_channel.c    | 12 +++++-------
 6 files changed, 32 insertions(+), 73 deletions(-)