commit 422abd4fa3c2c9c10f4e7f83eced7416785e89c4 Merge: ef106ce78 a2c44a7a7 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 10 14:48:12 2018 -0400

Merge branch 'ticket26526_26532'

changes/ticket26526 | 4 + changes/ticket26526_extra | 3 + src/app/config/config.c | 14 +-- src/app/config/statefile.c | 1 + src/core/mainloop/main.c | 1 + src/core/or/or.h | 4 +- src/feature/nodelist/routerlist.c | 1 + src/feature/rend/rendservice.c | 1 + src/lib/net/address.c | 223 ++---------------------------------- src/lib/net/address.h | 9 +- src/lib/net/{ipv6.c => inaddr.c} | 57 +++++++-- src/lib/net/{ipv4.h => inaddr.h} | 14 ++- src/lib/net/{ipv6.h => inaddr_st.h} | 21 ++-- src/lib/net/include.am | 7 +- src/lib/net/ipv4.c | 57 --------- src/lib/net/resolve.c | 183 +++++++++++++++++++++++++++++ src/lib/net/resolve.h | 8 +- src/test/test_addr.c | 62 +--------- src/test/test_config.c | 1 + src/test/test_connection.c | 2 +- src/test/test_controller.c | 1 + src/test/test_helpers.c | 1 + src/test/test_options.c | 1 + src/test/test_pt.c | 1 + src/tools/tor-gencert.c | 20 ++-- src/tools/tor-resolve.c | 23 ++-- 26 files changed, 320 insertions(+), 400 deletions(-)