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