[tor-commits] [tor/master] Merge branch 'bug9880_fix' into maint-0.2.4