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