[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4

[nickm at torproject.org]

commit 0ad8133a7e4f70120986f02bddb3abb6cc3d9509
Merge: 882893c 0b319de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 7 23:04:59 2014 -0400

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

 changes/ticket11528 |    6 ++++++
 src/common/tortls.c |    4 ++++
 2 files changed, 10 insertions(+)