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