[tor-commits] [tor/master] Merge branch 'bug31859_035' into bug31859_040