[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4