[tor-commits] [tor/maint-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5