[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4

[asn at torproject.org]

commit 8e9edb93be7771e44352c539abdf0b269ac56fab
Merge: 1770d1c216 aef9c0f580
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Aug 12 13:23:08 2020 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-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(-)