commit 6720628c9767e0337baabc346fd9fc0f6deac96d Merge: 705d3b2 92ae6b9 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 5 10:06:18 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18286 | 4 ++++ src/common/crypto.c | 38 ++++++++++++++++++++++++++++++++------ src/common/tortls.c | 10 ++++++++++ 3 files changed, 46 insertions(+), 6 deletions(-)