[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/536' into maint-0.3.5