commit 538b25241e9f2112e3a56449ba07c08f265f22f9 Merge: f152d5b15 b14b1f2b1 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 1 16:27:12 2020 -0400

Merge remote-tracking branch 'dgoulet/ticket33235_045_01'

src/app/config/resolve_addr.c | 12 +- src/test/test_config.c | 622 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 629 insertions(+), 5 deletions(-)