[tor-commits] [tor/master] Merge branch 'bug31343_31374_029' into bug31343_31374_035