commit 69deab8b2a5f09577fa4f15190c3aac181f5b6af Merge: f4b79bc 5bcf952 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 2 10:25:25 2015 -0500

Merge remote-tracking branch 'public/bug13319'

changes/bug13319 | 4 ++++ src/common/tortls.c | 55 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 12 deletions(-)