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