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