commit 090bff2dca81ce5c99e03cc7e73f4eab2c5ffbd1
Merge: 759de9f ad763a3
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Sep 25 14:35:18 2013 -0400
Merge remote-tracking branch 'public/bug6055_v2_024'
changes/bug6055 | 6 ++++++
src/common/tortls.c | 3 +++
2 files changed, 9 insertions(+)