commit 5888db496746e2fef344c40912ff07be8a216f9c Merge: 93894fb77 079912de4 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 9 16:02:41 2020 -0500

Merge branch 'disable_ns_macro'

changes/ticket32887 | 4 + src/test/test.h | 97 ---- src/test/test_accounting.c | 16 +- src/test/test_compat_libevent.c | 2 - src/test/test_dir.c | 64 +-- src/test/test_dir_handle_get.c | 70 +-- src/test/test_dns.c | 187 ++++--- src/test/test_options.c | 24 +- src/test/test_procmon.c | 2 - src/test/test_rendcache.c | 41 +- src/test/test_router.c | 10 +- src/test/test_routerset.c | 1027 +++++++++++++++++++-------------------- src/test/test_status.c | 603 ++++++++++++----------- src/test/test_tortls.c | 2 +- src/test/test_tortls_openssl.c | 4 - src/test/test_util_format.c | 2 - src/test/test_util_process.c | 1 - 17 files changed, 1026 insertions(+), 1130 deletions(-)