Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0