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

commit b7ed61167fb3ed9d3b623d008bf3360a3ffa95c4 Merge: 5980cb8a1 a207511bb Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 10 12:35:06 2018 -0400

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

changes/bug18642 | 5 +++++ src/core/or/relay.c | 8 ++++++++ src/feature/relay/dns.c | 41 +++++++++++++++++++++++++++++++++++++++-- src/feature/relay/dns.h | 2 ++ 4 files changed, 54 insertions(+), 2 deletions(-)