commit f4ac44c9f200bc19801021f9fc0b8ff12a648c96 Merge: 4cd93a6 e3da5ad Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 1 09:52:11 2016 -0500 Merge branch 'options_validate_second_round_cleaned' src/test/log_test_helpers.c | 70 +++++++------- src/test/log_test_helpers.h | 30 +++++- src/test/test_compat_libevent.c | 48 ++++------ src/test/test_options.c | 201 +++++++++++++++++++++------------------- src/test/test_tortls.c | 100 ++++++++------------ src/test/test_util_process.c | 8 +- 6 files changed, 229 insertions(+), 228 deletions(-)