commit 98a1b8770cc6a52cd958d49882dbbadd6ae212f0 Merge: 7232f0493 c75cf802d Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 21:34:43 2019 -0500
Merge branch 'maint-0.3.5'
changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)