commit 61612f980d397503ebdd0a2259fac233af6298c9 Merge: b28d818 def41e9 Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 6 20:24:29 2016 -0500

Merge branch 'maint-0.2.9'

changes/20460 | 4 ++++ src/test/test_tortls.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)