[tor-commits] [tor/master] Merge branch 'mr/113'

[asn at torproject.org]

commit d4f3cfe99a4c3ef3495a8f8848981f9b30cc8a34
Merge: cc4e42ee32 75772ea096
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 25 20:37:04 2020 +0300

    Merge branch 'mr/113'

 changes/bug20165                       |  6 ++++++
 src/core/or/channel.c                  |  2 ++
 src/core/or/channel.h                  |  3 +++
 src/core/or/channeltls.c               |  7 +++++++
 src/feature/relay/circuitbuild_relay.c | 24 +++++++++++++++++-------
 src/feature/relay/router.c             | 25 +++++++++++++++++++++++++
 src/feature/relay/router.h             |  1 +
 7 files changed, 61 insertions(+), 7 deletions(-)