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