[tor-commits] [tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5

[ahf at torproject.org]

commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a
Merge: d949a2f924 5a043825d0
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Oct 20 17:36:06 2021 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.5

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