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