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