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