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