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