[tor-commits] [tor/master] Merge branch 'bug31408_035' into bug31408_master