[tor-commits] [tor/master] Merge branch 'bug29036-29962-034' into bug29036-29962-035