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

[nickm at torproject.org]

commit 85d279e540439ab5387365e4f9ecbbb33df10579
Merge: fea5c6d79 85a879234
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 19:16:40 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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