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