[tor-commits] [tor/master] Merge branch 'bug30781_040' into bug30781_master