[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5

[nickm at torproject.org]

commit 84a5bd48e2717f29b547d9fd43d83cab3da39aaa
Merge: ed6a328297 435f31aed3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:05:31 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5

 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    | 13 +++++--------
 6 files changed, 32 insertions(+), 74 deletions(-)