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

author Nick Mathewson <nickm@torproject.org>

Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)

committer Nick Mathewson <nickm@torproject.org>

Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)
author Nick Mathewson <nickm@torproject.org>
Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)
committer Nick Mathewson <nickm@torproject.org>
Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)
diff --cc src/common/crypto.c
Simple merge
diff --cc src/or/circuitbuild.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)
		1	2
src/common/crypto.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/circuitbuild.c	patch \|	diff1 \|	diff2 \|	blob \| history