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