[tor-commits] [tor/master] Merge branch 'tor-github/pr/1288'