commit 22414c050b70923285634b62abf0865f186a357c Merge: a79a86c6d d52f40600 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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