[tor-commits] [tor/master] Merge branch 'bug30455_041' into bug30455_master