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

[ahf at torproject.org]

commit 16cbbf04c49715d2ba94e079597aeed284a6398d
Merge: caa305a5ad fdc7549b61
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Oct 20 17:36:07 2021 +0000

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/bug40371        | 6 ++++++
 src/feature/relay/dns.c | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)