[tor-commits] [tor/master] Merge branch 'bug1352' into maint-0.2.2