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