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