Merge remote branch 'origin/patches-2.0'

author Nick Mathewson <nickm@torproject.org>

Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)

committer Nick Mathewson <nickm@torproject.org>

Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)
author Nick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)
committer Nick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)
diff --cc evport.c
Simple merge
diff --cc http.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 22 Feb 2011 04:27:23 +0000 (23:27 -0500)
		1	2
evport.c	patch \|	diff1 \|	diff2 \|	blob \| history
http.c	patch \|	diff1 \|	diff2 \|	blob \| history