[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased'

[nickm at torproject.org]

commit 1385ab0605d8d5dfb441b74bdd324b10790499cd
Merge: 0696ac5 2e980e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 30 09:59:11 2015 -0400

    Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased'

 changes/test16831   |    3 +
 src/or/dns.c        |   29 ++-
 src/or/dns.h        |   12 ++
 src/or/router.c     |    4 +-
 src/or/router.h     |    2 +-
 src/test/test_dns.c |  503 ++++++++++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 514 insertions(+), 39 deletions(-)