[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket19998'

[nickm at torproject.org]

commit 4b182dfc237ba4457b654a0dbc124f721024dab2
Merge: c897328 c2d1356
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 13 08:54:43 2016 -0400

    Merge remote-tracking branch 'public/ticket19998'

 changes/bug19998    |  6 ++++++
 src/common/tortls.c | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)