[tor-commits] [tor/maint-0.2.8] Merge branch 'bug18133_027' into maint-0.2.8