[tor-commits] [tor/master] Merge branch 'bug27658_029' into maint-0.2.9