[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 1df701c082761775d311a966a222bca116afc3c2
Merge: 791ceb202 4de20d175
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 10 16:09:01 2018 -0500

    Merge branch 'maint-0.3.2'

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