[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23532'

[nickm at torproject.org]

commit e88fb4f4f8345a2067dbb2af0173002bab4637ce
Merge: 199f13755 e31a7be16
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 11:17:18 2017 -0400

    Merge remote-tracking branch 'catalyst-oniongit/bug23532'

 changes/bug23532    |  5 +++++
 src/or/channeltls.c | 27 ++++++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)