commit bbffd0a0187334c3ce80b446b08b6ea195da5063
Merge: b448ec1 d315b8e
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Oct 3 19:58:25 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
changes/bug13325 | 4 ++++
configure.ac | 4 ++++
src/common/tortls.c | 48 ++++++++++++++++++++++++++++++++++++++----------
3 files changed, 46 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
