commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Feb 7 08:39:07 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
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
