Merge commit 'origin/maint-0.2.1'

author Nick Mathewson <nickm@torproject.org>

Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)
diff --cc ChangeLog
Simple merge
diff --cc src/or/rendservice.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Sep 2009 16:53:44 +0000 (12:53 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/rendservice.c	patch \|	diff1 \|	diff2 \|	blob \| history