commit d315b8e8bc712f881fcc70624cb135a8e3855f63 Merge: e1a25f0 d1fa016 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 3 19:57:41 2014 -0400

Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5

changes/bug13325 | 4 ++++ configure.ac | 4 ++++ src/common/tortls.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 10 deletions(-)