commit eb896d5e6f09902a760af010326b79ce82492da1 Merge: 9c3f7a6 0b319de Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 17 12:17:14 2014 -0400

Merge remote-tracking branch 'public/ticket11528_024'

changes/ticket11528 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)