commit e78b7e27761df246349b4eee7667c304a68b73fd Merge: aa4f773 e9caa86 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 2 10:15:26 2015 -0500

Merge remote-tracking branch 'public/14188_part1'

changes/ticket14188_part1 | 2 ++ src/common/crypto.c | 18 +++++++++++++++++- src/common/tortls.c | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-)