[tor-commits] [tor/master] Merge branch 'bug31571_035' into bug31571_040