[tor-commits] [tor/master] Merge branch 'bug30956_041' into bug30956_master