Merge commit 'origin/maint-0.2.1'

author Nick Mathewson <nickm@torproject.org>

Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)
diff --cc ChangeLog
Simple merge
diff --cc src/or/config.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 13 May 2009 20:55:42 +0000 (16:55 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history