[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

[arma at torproject.org]

commit 41d9d3f90437ae9dbde1590faf0ffc412c68df19
Merge: 4a1a89b cecc5b7
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 16:34:45 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2