Merge branch 'bug3216_v2' into maint-0.2.2

author Nick Mathewson <nickm@torproject.org>

Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)

committer Nick Mathewson <nickm@torproject.org>

Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)
author Nick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)
committer Nick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)
diff --cc src/or/connection.c
Simple merge
diff --cc src/or/router.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)
		1	2
src/or/connection.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/router.c	patch \|	diff1 \|	diff2 \|	blob \| history