Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4