[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5