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

[nickm at torproject.org]

commit 245025a3dff5ffb893c0cc079a8e5d59df553529
Merge: 4c0c4d4ad d52f40600
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 19:16:40 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27226       |   5 +++
 src/common/tortls.c    |  10 +++--
 src/test/test_tortls.c | 119 +++++++++++++++++++++++++------------------------
 3 files changed, 71 insertions(+), 63 deletions(-)