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