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