[tor-commits] [tor/release-0.4.0] Merge branch 'tor-github/pr/978' into maint-0.4.0