Merge commit 'origin/maint-0.2.1'

author Roger Dingledine <arma@torproject.org>

Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)

committer Roger Dingledine <arma@torproject.org>

Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)
author Roger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)
committer Roger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)
diff --cc ChangeLog
Simple merge
diff --cc src/or/circuitlist.c
Simple merge
author	Roger Dingledine <arma@torproject.org>
	Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)
committer	Roger Dingledine <arma@torproject.org>
	Mon, 23 Nov 2009 15:16:38 +0000 (10:16 -0500)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	patch \|	diff1 \|	diff2 \|	blob \| history