Merge branch 'maint-0.2.1'

author Roger Dingledine <arma@torproject.org>

Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)

committer Roger Dingledine <arma@torproject.org>

Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)
author Roger Dingledine <arma@torproject.org>
Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)
committer Roger Dingledine <arma@torproject.org>
Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)
diff --cc ChangeLog
Simple merge
diff --cc src/or/connection_edge.c
Simple merge
author	Roger Dingledine <arma@torproject.org>
	Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)
committer	Roger Dingledine <arma@torproject.org>
	Mon, 21 Sep 2009 03:53:03 +0000 (23:53 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/connection_edge.c	patch \|	diff1 \|	diff2 \|	blob \| history