[tor-commits] [tor/master] Merge branch 'bug15245_026' into maint-0.2.6