commit 240c58017d12799cfaa7b4e326a0c25a2be17c4c Merge: 1f7dc82 05c2db3 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 31 14:09:21 2016 -0400

Merge branch 'log_test_improvements'

changes/bug19999_prep | 20 ++++++++ src/common/log.c | 5 ++ src/common/torlog.h | 5 ++ src/common/tortls.c | 4 ++ src/test/log_test_helpers.c | 103 +++++++++++++++++++++++++++++++++++----- src/test/log_test_helpers.h | 12 +++-- src/test/test_address.c | 5 +- src/test/test_compat_libevent.c | 12 ++++- src/test/test_tortls.c | 2 - src/test/test_util.c | 4 +- src/test/testing_common.c | 2 + 11 files changed, 153 insertions(+), 21 deletions(-)