Merge branch 'tor-gitlab/mr/50' into maint-0.3.5