[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5