[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit a499be33b88d390223581d49c3f3d90e00bf5d6d
Merge: 7ca0a9c4a 565ec6100
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 11:19:23 2017 -0500

    Merge branch 'maint-0.3.2'

 src/common/tortls.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)