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