Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5
commitf6a776d91565a88bd430152cc38c0a2019aac33b
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:32:16 +0000 (17 11:32 +0200)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:32:16 +0000 (17 11:32 +0200)
treefaae9e3dd454702170db3b77fb0a4505a18c6540
parent9e46855538e9b848b7c37fda502e5d109079cee0
parent66798dfdc069ffc2ce1a9cb84529d2015dd3cd66
Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5
src/common/tortls.c