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

[nickm at torproject.org]

commit 890162761664e29ec4240a54489a6d32a432ace3
Merge: 90685b760 320dac460
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 10 16:09:00 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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