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