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