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

[dgoulet at torproject.org]

commit e7da6810346c0e141d67e67db8ff4a1bdaedf67f
Merge: 43b3880578 aae9a05a01
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Dec 21 14:55:44 2020 -0500

    Merge branch 'maint-0.4.5'

 changes/ticket40201           |  3 +++
 src/app/config/resolve_addr.c | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)