Merge branch 'tor-github/pr/891' into maint-0.4.0