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

[nickm at torproject.org]

commit 1e46a391b3ef4dfc65044f900684368ea234c290
Merge: 9fcb3ef78 2ec88a2a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 09:15:15 2018 -0400

    Merge branch 'ticket27344_029' into maint-0.2.9

 changes/bug27344    | 4 ++++
 configure.ac        | 1 +
 src/common/tortls.c | 6 +++++-
 3 files changed, 10 insertions(+), 1 deletion(-)