Nick Mathewson 7ef04e4b48 Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
	configure.in
	test/regress_buffer.c
	test/regress_dns.c
2012-07-26 10:09:13 -04:00
..