commit f44c12a708de1bceb4dfac9490a67c8f41baee6e Merge: 7bbec935c5 aae9a05a01 Author: David Goulet dgoulet@torproject.org Date: Mon Dec 21 14:55:44 2020 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

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