[or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

[arma]

commit 029ca804b2bed051185cc21477a713f670106cae
Merge: a62038f 69771bb
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Dec 21 15:48:06 2010 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2