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