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