Merge commit 'origin/maint-0.2.1'
commit64dce12ac8bb0e223a9c9cdd43597168e43c63a3
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Sep 2009 19:59:40 +0000 (1 15:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Sep 2009 19:59:40 +0000 (1 15:59 -0400)
tree12f66db5821626ed58938666eacb1ad4ba314cc1
parentbffe671c5da1c4d601a4e0b42f0e5345fc3a2fd1
parent4f2f7672dc194e3003ce5497ed9cf7ee23d30912
Merge commit 'origin/maint-0.2.1'
control-spec.txt