commit 320dac4602dd26bc64f1f0fd1cff5d7b38bb09eb
Merge: 0ddc2dc53 0dbe3ddc3
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Sat Feb 10 16:08:58 2018 -0500
Merge branch 'bug24978_029_enable' into maint-0.2.9
changes/bug24978 | 7 +++++++
src/common/ciphers.inc | 21 ++++++++++++++++++++-
src/common/tortls.c | 28 +++++++++++++++++++++++++---
3 files changed, 52 insertions(+), 4 deletions(-)