[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1