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