[tor-commits] [globe/master] Merge branch 'trac-16835'