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