[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6