[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1910/head'

[nickm at torproject.org]

commit 2b98df3c7478b03c82f2d284dad18ba33fe8c41c
Merge: 284e9459b 8b568b50a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 4 10:33:36 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1910/head'

 src/app/config/resolve_addr.c | 6 ++++++
 src/lib/net/address.c         | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)