commit abc9ce324e7a0c6a482a861f48fc6bbf0589986b Merge: 532a43e 1bac468 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 4 13:20:21 2016 -0500 Merge branch 'always_init_base' src/test/test.c | 4 ---- src/test/test_circuitmux.c | 4 ---- src/test/test_dns.c | 2 +- src/test/testing_common.c | 5 +++++ 4 files changed, 6 insertions(+), 9 deletions(-)