[tor-commits] [tor/master] Merge branch 'bug24826_031' into maint-0.3.1