commit 55c7a559df5f349de21ca37ecfe19b736085c317 Merge: 307aa7e cca6198 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 10 11:17:39 2014 -0400

Merge remote-tracking branch 'public/bug12227_024'

changes/bug12227 | 5 +++++ src/common/tortls.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)