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