[tor-commits] [tor/master] Merge branch 'tor-github/pr/1334'

[asn at torproject.org]

commit 01a797be4ef4e55031f56307b4f8485bd6402c13
Merge: 0a77e5f1c 2d744de35
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Sep 25 14:19:02 2019 +0300

    Merge branch 'tor-github/pr/1334'

 changes/bug31107         |  4 ++++
 src/core/or/channeltls.c | 35 +++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 12 deletions(-)