[tor-commits] [tor/master] Merge branch 'bug31466_035' into bug31466_042