Merge commit 'origin/maint-0.2.1'

author Nick Mathewson <nickm@torproject.org>

Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)

committer Nick Mathewson <nickm@torproject.org>

Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)
author Nick Mathewson <nickm@torproject.org>
Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)
committer Nick Mathewson <nickm@torproject.org>
Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)
diff --cc ChangeLog
Simple merge
diff --cc src/or/rendclient.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 8 Feb 2010 03:34:08 +0000 (22:34 -0500)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/rendclient.c	patch \|	diff1 \|	diff2 \|	blob \| history