Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1