[tor-commits] [tor/master] Merge branch 'bug21051_v2' into maint-0.2.9