[tor-commits] [tor/maint-0.3.0] Merge branch 'bug15582_029' into maint-0.2.9