commit 45a90573e69d12dc6fece4c6bab15a1268e90778
Merge: 9fee289 452cebc
Author: Nick Mathewson <[email protected]>
Date: Thu May 21 13:20:24 2015 -0400
Merge remote-tracking branch 'yawning/ticket16140'
changes/ticket16140 | 6 ++++++
src/common/tortls.c | 34 +++++++++++++++++++++++++++++-----
src/common/tortls.h | 2 ++
src/or/config.c | 3 +++
src/test/bench.c | 7 -------
5 files changed, 40 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
