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