[tor-commits] [tor/main] Merge branch 'bug40390_035_squashed' into maint-0.3.5