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