[tor-commits] [tor/release-0.2.7] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7

[nickm at torproject.org]

commit 4fb49069753c37a2425427864212bc3a1f49d980
Merge: b809c26 9459ae2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 12:02:42 2015 -0400

    Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7

 src/common/tortls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)