commit 2c5a2c6997444817599a8dc5f8d6826c71d0e965 Merge: 412b665d5f 84a5bd48e2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.3.5' into release-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(-)