[tor-commits] [tor/main] Merge branch 'tor-gitlab/mr/393' into maint-0.4.6