commit b809c265e77f4528b59aa3932a3cde8bf5e19fb3
Merge: 9c4a0ae 35bf07b
Author: Nick Mathewson
Date: Wed Oct 21 11:51:03 2015 -0400
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
changes/bug17404|6 ++
src/common/tortls.c |4
commit 4fb49069753c37a2425427864212bc3a1f49d980
Merge: b809c26 9459ae2
Author: Nick Mathewson
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