[tor-commits] [tor/release-0.3.4] Merge branch 'tor-github/pr/820' into maint-0.3.4