Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Dec 2011 18:38:40 +0000 (13:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Dec 2011 18:38:40 +0000 (13:38 -0500)
1  2 
test/regress_dns.c

Simple merge