[tor-commits] [tor/master] Merge branch 'bug24167_025' into maint-0.2.5