Merge branch 'maint-0.2.1'

author Roger Dingledine <arma@torproject.org>

Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)

committer Roger Dingledine <arma@torproject.org>

Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)
author Roger Dingledine <arma@torproject.org>
Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)
committer Roger Dingledine <arma@torproject.org>
Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)
diff --cc ChangeLog
Simple merge
diff --cc doc/spec/control-spec.txt
Simple merge
author	Roger Dingledine <arma@torproject.org>
	Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)
committer	Roger Dingledine <arma@torproject.org>
	Fri, 28 Aug 2009 07:47:18 +0000 (03:47 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
doc/spec/control-spec.txt	patch \|	diff1 \|	diff2 \|	blob \| history