[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9

[teor at torproject.org]

commit c06d540ff9b507e0fa9749948fe406fb17dbee73
Merge: 752c35ca9 3c97ab3c2
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:14:53 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9

 changes/bug31107    |  4 ++++
 src/or/channeltls.c | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)