[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1