[tor-commits] [tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5