commit 9c048d90b6b17f6d54fd8adfbe301db6e98d6142 Merge: b600495 c56bb30 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 9 11:06:20 2013 -0500
Merge remote-tracking branch 'public/bug10131_024'
changes/bug10313 | 8 ++++++++
src/or/channeltls.c | 14 ++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
