commit 6b828ced0f6dbff3f3dcbcfbe57959467f548a58 Merge: 8ac1f8663b 8a561fc5bf Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:05:40 2020 -0400

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