[tor-commits] [tor/master] Merge branch 'bug15515_024' into maint-0.2.4