[tor-commits] [tor/master] Merge branch 'bug29670_035' into bug29670_041