Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5