Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5