[tor-commits] [tor/release-0.4.6] Merge branch 'mr_347_squashed' into maint-0.4.6

[nickm at torproject.org]

commit 0ceacb5482848a4029eaf26095619ad09ff22c52
Merge: d162b98548 6281c90885
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 19 11:40:44 2021 -0400

    Merge branch 'mr_347_squashed' into maint-0.4.6

 changes/ticket40290           |  3 +++
 src/app/config/resolve_addr.c | 12 ++++++++++++
 2 files changed, 15 insertions(+)