[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 5cdc7a40ab61181fdb14f11d71b1e6e066f4a7b3
Merge: c1d23c6 b928095
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 10:39:54 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/21359          |  8 ++++++++
 configure.ac           |  5 +++++
 src/test/test_tortls.c | 43 ++++++++++++++++++++++++-------------------
 3 files changed, 37 insertions(+), 19 deletions(-)