diff --git a/go.mod b/go.mod index 4a973c15..30d7f441 100644 --- a/go.mod +++ b/go.mod @@ -7,18 +7,19 @@ require ( github.com/AndreasBriese/bbloom v0.0.0-20170702084017-28f7e881ca57 // indirect github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20170228160301-b276127301a9 // indirect github.com/Psiphon-Labs/bolt v0.0.0-20200203172706-f3d58e369264 // indirect + github.com/Psiphon-Labs/chacha20 v0.2.1-0.20200128191310-899a4be52863 // indirect github.com/Psiphon-Labs/dns v0.0.0-20170814182607-d23cdaf67bbc // indirect github.com/Psiphon-Labs/goarista v0.0.0-20160825065156-d002785f4c67 // indirect github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5 // indirect github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742 // indirect - github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10-0.20200122032119-5e7e7f3eddd2+incompatible - github.com/Psiphon-Labs/quic-go v0.14.1-0.20200116022806-abf539ac596a // indirect + github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10+incompatible + github.com/Psiphon-Labs/quic-go v0.14.1-0.20200128193928-738e15bfe6c3 // indirect github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243 // indirect - github.com/apex/log v1.1.1 - github.com/aristanetworks/goarista v0.0.0-20200124011733-f6bb3fedfb04 // indirect + github.com/apex/log v1.1.2 + github.com/aristanetworks/goarista v0.0.0-20200206021550-59c4040ef2d3 // indirect github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f // indirect github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect - github.com/avast/retry-go v2.4.3+incompatible + github.com/avast/retry-go v2.5.0+incompatible github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect github.com/boltdb/bolt v1.3.1 // indirect github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect @@ -54,4 +55,5 @@ require ( go.uber.org/atomic v1.3.3-0.20180806045314-ca680462431f // indirect go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df // indirect go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15 // indirect + golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect ) diff --git a/go.sum b/go.sum index 3cacbd27..b20e8079 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20170228160301-b276127301a9 h1: github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20170228160301-b276127301a9/go.mod h1:ZdY5pBfat/WVzw3eXbIf7N1nZN0XD5H5+X8ZMDWbCs4= github.com/Psiphon-Labs/bolt v0.0.0-20200203172706-f3d58e369264 h1:HE/SqHaxiGrMq8u7/MZOVRmeFz1lkMazsXI4xA5ygGE= github.com/Psiphon-Labs/bolt v0.0.0-20200203172706-f3d58e369264/go.mod h1:JRYGUlpSqM4W5cdQu2oUVfNoAw1XJ79ibUQ+OHc1QiE= +github.com/Psiphon-Labs/chacha20 v0.2.1-0.20200128191310-899a4be52863 h1:K6noP73BqojSybxrJnGRVmCOFsQ4vCAL2/h4K0k7p8A= +github.com/Psiphon-Labs/chacha20 v0.2.1-0.20200128191310-899a4be52863/go.mod h1:etJKEBpSqqzNKGPLUYlVc0dTE5LEkGRcR8fa127A5UQ= github.com/Psiphon-Labs/dns v0.0.0-20170814182607-d23cdaf67bbc h1:W+dNJivdYUujm+mhvmSDn3847jbzar8J7qzjj/w4U6I= github.com/Psiphon-Labs/dns v0.0.0-20170814182607-d23cdaf67bbc/go.mod h1:F1eU0RdWZXN2kn6A8cBRixr1HLyM1Va7xXp88LRhlps= github.com/Psiphon-Labs/goarista v0.0.0-20160825065156-d002785f4c67 h1:aQE2/masBGr/uqI63UIxN/IkRByNTxjYz2JYySw9ry8= @@ -38,10 +40,10 @@ github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5 h1:j/XkyeIrn1 github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5/go.mod h1:Pe5BqN2DdIdChorAXl6bDaQd/wghpCleJfid2NoSli0= github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742 h1:te4lDZfA3tFwaheo+h/GZYGiLGJvm7Dcq2YkFh13QmE= github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742/go.mod h1:3mBCrUrPxFCKAhG0ZdEfiU7QU6zl2+gr1HUk1sKYdjI= -github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10-0.20200122032119-5e7e7f3eddd2+incompatible h1:aOG3DD26FWCtmrqHcCp3vwzZf93gsNk/WOuzH2tCiGI= -github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10-0.20200122032119-5e7e7f3eddd2+incompatible/go.mod h1:VcNEtiQ0z2sCGJf16ZGcpwCas5+r9rt+P20r6LlJ06U= -github.com/Psiphon-Labs/quic-go v0.14.1-0.20200116022806-abf539ac596a h1:MfvK88D9Digt/FMxOXs1qeFXsmp8aIOCsKh6UpMcKHY= -github.com/Psiphon-Labs/quic-go v0.14.1-0.20200116022806-abf539ac596a/go.mod h1:I0Z7XA8KzHZl2MzwqEbZJhBQOHT8ajGUQ5+SWf5KHw0= +github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10+incompatible h1:qergzea7ay5dBA7A+VW9CGEtokIYaO3yGNs7oS851xg= +github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10+incompatible/go.mod h1:VcNEtiQ0z2sCGJf16ZGcpwCas5+r9rt+P20r6LlJ06U= +github.com/Psiphon-Labs/quic-go v0.14.1-0.20200128193928-738e15bfe6c3 h1:QDJvvj1jPnvPiT12g2rypiHXNnb6GS0sb3vCGc/SiVE= +github.com/Psiphon-Labs/quic-go v0.14.1-0.20200128193928-738e15bfe6c3/go.mod h1:I0Z7XA8KzHZl2MzwqEbZJhBQOHT8ajGUQ5+SWf5KHw0= github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243 h1:UfS5bLTwiVnbRub2H6lAcS+T2e62RWWc/LgZs8lXkn4= github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE= github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= @@ -56,20 +58,23 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/apex/log v1.1.1 h1:BwhRZ0qbjYtTob0I+2M+smavV0kOC8XgcnGZcyL9liA= github.com/apex/log v1.1.1/go.mod h1:Ls949n1HFtXfbDcjiTTFQqkVUrte0puoIBfO3SVgwOA= +github.com/apex/log v1.1.2 h1:bnDuVoi+o98wOdVqfEzNDlY0tcmBia7r4YkjS9EqGYk= +github.com/apex/log v1.1.2/go.mod h1:SyfRweFO+TlkIJ3DVizTSeI1xk7jOIIqOnUPZQTTsww= +github.com/apex/logs v0.0.3/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI= github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= -github.com/aristanetworks/goarista v0.0.0-20200124011733-f6bb3fedfb04 h1:7GX30sa84yFeSNranBVw+1cNAjFNxEpq4IDWZFwmh14= -github.com/aristanetworks/goarista v0.0.0-20200124011733-f6bb3fedfb04/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= +github.com/aristanetworks/goarista v0.0.0-20200206021550-59c4040ef2d3 h1:y1poWrL93oTYqikei1Sf8eBE6cJxNPr5wJcfxdgbuXQ= +github.com/aristanetworks/goarista v0.0.0-20200206021550-59c4040ef2d3/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f h1:SaJ6yqg936TshyeFZqQE+N+9hYkIeL9AMr7S4voCl10= github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/avast/retry-go v2.4.3+incompatible h1:c/FTk2POrEQyZfaHBMkMrXdu3/6IESJUHwu8r3k1JEU= -github.com/avast/retry-go v2.4.3+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= +github.com/avast/retry-go v2.5.0+incompatible h1:8SaFqliw34WeeaPs+GEtMMkiwEsC2S6+YyqnLqI55Ks= +github.com/avast/retry-go v2.5.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -446,6 +451,8 @@ golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA= golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=