commit 6bbeb08f927916e1675d630dc61b3d0d5fb01abe Merge: 9201bbd96 eebd2d44a Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 14 15:55:27 2019 -0400

Merge branch 'maint-0.4.2'

changes/ticket31841 | 5 +++ src/lib/net/resolve.c | 29 +++++++------- src/lib/net/resolve.h | 15 ++++++++ src/test/include.am | 2 + src/test/resolve_test_helpers.c | 85 +++++++++++++++++++++++++++++++++++++++++ src/test/resolve_test_helpers.h | 18 +++++++++ src/test/test_addr.c | 6 ++- src/test/test_config.c | 4 ++ src/test/test_hs_config.c | 8 ++-- src/test/test_options.c | 3 ++ 10 files changed, 155 insertions(+), 20 deletions(-)