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