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