[tor-commits] [tor/master] Merge branch 'ticket21953_029'