[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5

[nickm at torproject.org]

commit f6a776d91565a88bd430152cc38c0a2019aac33b
Merge: 9e46855 66798df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 17 11:32:16 2014 +0200

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

 changes/bug12602    |    5 +++++
 src/common/tortls.c |    2 ++
 2 files changed, 7 insertions(+)