commit ed13a7f6251723eecacfb527576dc1eb1353fe88 Merge: abd620538 86583ad78 Author: Nick Mathewson nickm@torproject.org Date: Sat Feb 10 16:09:01 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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