Merge remote branch 'origin/maint-0.2.2'
commitcbdd7b4e5edbe552f03acea616cd48ca6c8c84fb
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Dec 2010 17:45:38 +0000 (1 12:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Dec 2010 17:45:38 +0000 (1 12:45 -0500)
treea3a1f94f5be2eb2af3205a63b05a02f8aed2080b
parentdcc7d30f8d10317093106537acf092b44755bb55
parent130ff4614dce691a0d28855210b415d1d279e621
Merge remote branch 'origin/maint-0.2.2'
control-spec.txt