[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

commit cbf71c4fa7a05033c068844ce9f214eeff5bb939 Merge: 07237b484e 0ceacb5482 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 19 11:43:39 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)