commit b809c265e77f4528b59aa3932a3cde8bf5e19fb3 Merge: 9c4a0ae 35bf07b Author: Nick Mathewson <ni...@torproject.org> 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 ++++
2 files changed, 10 insertions(+)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
