[tor-commits] [tor/master] Merge branch 'pr-1569-squashed'