commit 6edc9bcc1376b7a9f31fc54239e9df7fdfa9d044 Merge: 07989171e3 16cbbf04c4 Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 20 17:36:07 2021 +0000

Merge branch 'maint-0.4.6' into release-0.4.6

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