commit 24551d64ad98f88977b81fd8df26837772f2902c Merge: f1530d0 b928095 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 1 10:39:59 2017 -0500 Merge branch 'maint-0.2.9' changes/21359 | 8 ++++++++ configure.ac | 5 +++++ src/test/test_tortls.c | 43 ++++++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 19 deletions(-)