[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5

[ahf at torproject.org]

commit db112329a0358a8e9138c782ee48c5e3f3d1f35d
Merge: 44e105c27f f20f5a4e37
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Oct 20 17:35:35 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5

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