[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9