Merge pull request #16470 from 1715173329/xray
authorRosen Penev <rosenp@gmail.com>
Fri, 27 Aug 2021 08:04:31 +0000 (01:04 -0700)
committerGitHub <noreply@github.com>
Fri, 27 Aug 2021 08:04:31 +0000 (01:04 -0700)
commita1331fbd8139a5dafc7ca66fe8bf91a371a32f9b
treed16461aac716122ca5be782fb4ddc1a076aedff0
parentbd4ad7b0baa3c95c5c8ee88c1aa372030fc6a47a
parentdcd3f288e441dac264f4c34e19270e75d38933eb
Merge pull request #16470 from 1715173329/xray

xray-core: fix build under go 1.17