[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9