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