commit d52f406001082474c3decf04747bf6f742b82c96 Merge: c798957b5 85a879234 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

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