Merge pull request #15122 from 1715173329/xray-update
authorRosen Penev <rosenp@gmail.com>
Sun, 14 Mar 2021 23:34:47 +0000 (16:34 -0700)
committerGitHub <noreply@github.com>
Sun, 14 Mar 2021 23:34:47 +0000 (16:34 -0700)
xray-core: Update to 1.4.0


Trivial merge