[tor-commits] [tor/master] Merge branch 'bug29042_035' into maint-0.3.5