commit a34b9a0b6258d0f1d9373fcf7aacf1e30f8efd37 Merge: 2e98e8811 45afb31e1 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 2 11:00:48 2020 -0400

Merge branch 'ticket33238_045_01_squashed'

changes/ticket33238 | 5 + src/app/config/resolve_addr.c | 29 +- src/test/test_config.c | 852 +++++++++++------------------------------- 3 files changed, 228 insertions(+), 658 deletions(-)