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