diff --git a/.github/workflows/go1.19.yml b/.github/workflows/go1.19.yml index 6a09e58..34ed310 100644 --- a/.github/workflows/go1.19.yml +++ b/.github/workflows/go1.19.yml @@ -18,11 +18,11 @@ jobs: steps: - uses: actions/checkout@v2 - - run: go install golang.org/dl/go1.19@latest + - run: go install golang.org/dl/go1.19.1@latest - - run: $(go env GOPATH)/bin/go1.19 download + - run: $(go env GOPATH)/bin/go1.19.1 download - - run: $(go env GOPATH)/bin/go1.19 build -v ./... + - run: $(go env GOPATH)/bin/go1.19.1 build -v ./... - - run: $(go env GOPATH)/bin/go1.19 test -short -race -tags shaping ./... + - run: $(go env GOPATH)/bin/go1.19.1 test -short -race -tags shaping ./... diff --git a/GOVERSION b/GOVERSION index 8e8b0a9..04a8bc2 100644 --- a/GOVERSION +++ b/GOVERSION @@ -1 +1 @@ -1.18.5 +1.18.6 diff --git a/go.mod b/go.mod index b8cc7d3..8411db2 100644 --- a/go.mod +++ b/go.mod @@ -25,8 +25,8 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/montanaflynn/stats v0.6.6 github.com/ooni/go-libtor v1.1.6 - github.com/ooni/oocrypto v0.1.1 - github.com/ooni/oohttp v0.2.1 + github.com/ooni/oocrypto v0.1.2 + github.com/ooni/oohttp v0.2.2 github.com/ooni/probe-assets v0.12.0 github.com/ooni/psiphon/tunnel-core v0.0.0-20220819091114-7dccc0b6b6cd github.com/oschwald/geoip2-golang v1.8.0 @@ -39,7 +39,7 @@ require ( gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 - golang.org/x/net v0.0.0-20220812174116-3211cb980234 + golang.org/x/net v0.0.0-20220906165146-f3363e06e74c golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 ) diff --git a/go.sum b/go.sum index 73294ac..6223e5f 100644 --- a/go.sum +++ b/go.sum @@ -629,10 +629,10 @@ github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/ooni/go-libtor v1.1.6 h1:hf4xq2vS5E5bBC5BdG+D8orrPo81FRLXAVTDIpL4rzY= github.com/ooni/go-libtor v1.1.6/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI= -github.com/ooni/oocrypto v0.1.1 h1:zYU9fxEGNHAd73gB8aRfbvvvAzdqRe/EXVlY64cMn7c= -github.com/ooni/oocrypto v0.1.1/go.mod h1:tP8tp455ERRdy38YWJQtQHb5LB6I5DvI4ffrnouypnM= -github.com/ooni/oohttp v0.2.1 h1:MGvRAXJdLFNqKeS5HXynIt8y7JIknmdTwC7DRpzDBko= -github.com/ooni/oohttp v0.2.1/go.mod h1:fgNDPYw+nsgEKCDBpT/4R06bgnrCRtvgNmAWOCmm4JE= +github.com/ooni/oocrypto v0.1.2 h1:/vbdpYWdC6u6W88qMIOZQ7Y9Ay1pVrQwIdYnQpQCbTc= +github.com/ooni/oocrypto v0.1.2/go.mod h1:tP8tp455ERRdy38YWJQtQHb5LB6I5DvI4ffrnouypnM= +github.com/ooni/oohttp v0.2.2 h1:fKPeKMnTJ/EDlo6/+fwjTF7Arvl2SK3t9kcsYTb31Mo= +github.com/ooni/oohttp v0.2.2/go.mod h1:fgNDPYw+nsgEKCDBpT/4R06bgnrCRtvgNmAWOCmm4JE= github.com/ooni/probe-assets v0.12.0 h1:T4G69LO7T8jvg+wfLq2ieKsz00SQuPOXCNNQGuOe7EY= github.com/ooni/probe-assets v0.12.0/go.mod h1:gI9d0ZNBkMsNgK5Me3m3K+QqWzFwHKP7KGZgyCB7IH4= github.com/ooni/psiphon/tunnel-core v0.0.0-20220819091114-7dccc0b6b6cd h1:zKGpY8HLA6dSStqV8df1BzfUz2lZ9Yh9XeokLhAOHls= @@ -1093,8 +1093,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= -golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=