commit 0e8ee795d901c1a5ac84e53bbea417fddace46bf Merge: 8f9fb63 ad763a3 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 31 13:14:39 2013 -0400

Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4

changes/bug6055 | 6 ++++++ src/common/tortls.c | 3 +++ 2 files changed, 9 insertions(+)