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

9 jobs for maint-0.4.5 in 16 minutes and 15 seconds (queued for 3 seconds)