[tor-commits] [tor/master] Merge branch 'ticket31374_029' into ticket31374_035