commit c75cf802d3061633bf0679ce8df33660a3be9345 Merge: abdc6aede 16199a54a Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 21:34:35 2019 -0500

Merge branch 'ticket28879' into maint-0.3.5

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