[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/425'

[nickm at torproject.org]

commit 30d853a9067e866312e475f42fb6063718591af8
Merge: 084924360 b7edfcbf6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 30 09:16:55 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/425'

 changes/bug21900        |  4 +++
 configure.ac            |  2 ++
 doc/tor.1.txt           |  3 +-
 src/feature/relay/dns.c | 90 +++++++++++++++++++++++++++++++++++++++----------
 src/feature/relay/dns.h |  5 +++
 src/test/test_dns.c     | 66 ++++++++++++++++++++++++++++++++++++
 6 files changed, 152 insertions(+), 18 deletions(-)