commit 46de5eb054cfdcedad0f7971d9a0defbd5e21db0 Merge: a9913435bc 5a043825d0 Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 20 17:36:06 2021 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

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