[tor-commits] [tor/master] Merge branch 'ticket33236_045_01'

[dgoulet at torproject.org]

commit 640a777c9bf3b581dd951a9021aefe3f8dd9d3ce
Merge: aa80f73fc 809c86470
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 7 11:01:26 2020 -0400

    Merge branch 'ticket33236_045_01'

 changes/ticket33236           |  4 ++
 src/app/config/resolve_addr.c | 58 ++++++++++++++++++++++++++++
 src/app/config/resolve_addr.h |  6 +++
 src/test/test_config.c        | 90 ++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 149 insertions(+), 9 deletions(-)