Merge remote-tracking branch 'origin/patches-2.0'

author Nick Mathewson <nickm@torproject.org>

Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)

committer Nick Mathewson <nickm@torproject.org>

Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
author Nick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
committer Nick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
diff --cc evdns.c
Simple merge
diff --cc evmap.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
		1	2
evdns.c	patch \|	diff1 \|	diff2 \|	blob \| history
evmap.c	patch \|	diff1 \|	diff2 \|	blob \| history