[tor-commits] [tor/master] Merge branch 'bug29875_035' into bug29875_master