Merge remote-tracking branch 'rl1987/test_dns_resolve_rebased'
commite8675dc7fc7475804ca23916f18d9438bd0fe84a
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Aug 2015 15:32:40 +0000 (26 11:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Aug 2015 15:32:40 +0000 (26 11:32 -0400)
tree42b61d93ec700d9f825af06745db59161a36751a
parent1eb210637539ce71794ff49fc462c35511b8a141
parent99a03b2389f9b57084c8f616b8252fbb671275cf
Merge remote-tracking branch 'rl1987/test_dns_resolve_rebased'
src/test/include.am