[tor-commits] [tor/master] Merge branch 'bug31463_035' into bug31463_040