commit cce39dd915fd6c98468a2565ba67f6cc0c59f4bf Merge: 48cd932ed1 8e9edb93be Author: George Kadianakis desnacked@riseup.net Date: Wed Aug 12 13:23:33 2020 +0300

Merge branch 'maint-0.4.4' into release-0.4.4

changes/ticket40081 | 6 ++++++ src/core/or/channel.c | 46 +++++++--------------------------------------- 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, 33 insertions(+), 74 deletions(-)