[tor-commits] [tor/release-0.3.1] Merge branch 'bug26158_031' into maint-0.3.1