Merge remote-tracking branch 'origin/maint-0.2.2'

author Nick Mathewson <nickm@torproject.org>

Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)
diff --cc src/or/circuitbuild.c
Simple merge
diff --cc src/or/routerparse.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 17 May 2011 23:47:48 +0000 (19:47 -0400)
		1	2
src/or/circuitbuild.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	patch \|	diff1 \|	diff2 \|	blob \| history