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