[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5