[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/148' into master

[asn at torproject.org]

commit 19302a1dfd8da73ff86b0c36534221b71c501c32
Merge: f7adf3653f cb4cedae68
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Oct 20 13:26:19 2020 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/148' into master

 changes/ticket25061                     |  6 ++++++
 src/core/or/channel.c                   | 13 ++++++++++++-
 src/core/or/channel.h                   |  2 ++
 src/core/or/channeltls.c                | 25 +++++++++++++++++++++++++
 src/core/or/circuitbuild.c              |  8 ++++++++
 src/core/or/or_connection_st.h          |  5 +++++
 src/feature/control/control_bootstrap.c | 12 ++++++++++++
 src/feature/relay/circuitbuild_relay.c  |  1 +
 src/test/test_channel.c                 | 20 ++++++++++----------
 src/test/test_circuitbuild.c            |  2 ++
 10 files changed, 83 insertions(+), 11 deletions(-)