commit 8e5c75e89657384516f8c777c1b5fee44bcadc5e Merge: 7177eeddf 2ef2fef71 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 5 09:09:16 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1772/head' src/feature/relay/dns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)