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

[nickm at torproject.org]

commit 86583ad78e6c75ea0094553584428f795089c482
Merge: 04a8e81fa 320dac460
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 10 16:09:00 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24978       |  7 +++++++
 src/common/ciphers.inc | 21 ++++++++++++++++++++-
 src/common/tortls.c    | 28 +++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 4 deletions(-)