[tor-commits] [tor/master] Merge branch 'bug30958_035' into bug30958_040