Merge branch 'tor-gitlab/mr/556' into maint-0.4.5

9 jobs for maint-0.4.5 in 19 minutes and 9 seconds (queued for 1 second)