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