Merge commit 'origin/maint-0.2.1'

author Nick Mathewson <nickm@torproject.org>

Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)

committer Nick Mathewson <nickm@torproject.org>

Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)
author Nick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)
committer Nick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)
diff --cc ChangeLog
Simple merge
diff --cc src/or/dirserv.c
Simple merge
diff --cc src/or/router.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 13 Aug 2009 02:02:07 +0000 (22:02 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/dirserv.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/router.c	patch \|	diff1 \|	diff2 \|	blob \| history