[tor-commits] [tpo/master] Merge branch 'watch-privchat-2'