commit e36faeec1d40e1f4f7ae54c798ad4492f86f594c
Merge: b3bc871 e0c3de4
Author: Nick Mathewson <[email protected]>
Date: Fri Feb 6 15:42:53 2015 -0500
Merge remote-tracking branch 'sebastian/bug13993'
changes/bug13993 | 4 ++++
src/common/log.c | 6 ++++++
src/or/connection.c | 4 +---
src/or/control.c | 6 ++++--
src/test/test.c | 3 ++-
src/test/test_dir.c | 1 -
6 files changed, 17 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
