[tor-commits] [tor/master] Merge branch 'bug29599_029' into bug29599_033