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

[nickm at torproject.org]

commit e8675dc7fc7475804ca23916f18d9438bd0fe84a
Merge: 1eb2106 99a03b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 26 11:32:40 2015 -0400

    Merge remote-tracking branch 'rl1987/test_dns_resolve_rebased'

 changes/ticket16831_part1 |    3 +
 src/or/connection.c       |    4 +-
 src/or/connection.h       |    2 +-
 src/or/dns.c              |  116 +++--------------
 src/or/dns.h              |   18 ++-
 src/or/dns_structs.h      |   90 ++++++++++++++
 src/test/include.am       |    1 +
 src/test/test.c           |    2 +
 src/test/test_dns.c       |  304 +++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 434 insertions(+), 106 deletions(-)