[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/369'

commit a56ed0cfa4444bc6434e19962cf8f3f726958c0f Merge: 4e62c17114 f20f5a4e37 Author: Alexander Færøy <ahf@torproject.org> Date: Mon May 10 10:58:29 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/369' changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)