commit 60d6a2ca688b5d353e8eee792305215528118bbe Merge: d32ffe580 245025a3d Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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