diff --git a/.github/workflows/alltests.yml b/.github/workflows/alltests.yml index ade85b8924..62d9460ab2 100644 --- a/.github/workflows/alltests.yml +++ b/.github/workflows/alltests.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: go test -race -tags shaping ./... diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1aba5bb89d..a8cd09bbca 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,6 +12,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./mk OONI_PSIPHON_TAGS="" ./MOBILE/android/oonimkall.aar diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1d212dc6e7..015108e412 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - go: [ "1.17.2" ] + go: [ "1.17.3" ] steps: - uses: actions/setup-go@v1 with: diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 8d6448a1d3..0a2e66947e 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: go generate ./... diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 87158ea2d4..075877edb1 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -12,6 +12,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./mk OONI_PSIPHON_TAGS="" XCODE_VERSION=12.4 ./MOBILE/ios/oonimkall.framework.zip diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml index 0659efca6d..0a27118603 100644 --- a/.github/workflows/jafar.yml +++ b/.github/workflows/jafar.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: go build -v ./internal/cmd/jafar - run: sudo ./testjafar.bash diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d21dfe2e1b..f98d63b81c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/darwin/amd64/ooniprobe - run: ./E2E/ooniprobe.sh ./CLI/darwin/amd64/ooniprobe diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml index 9d8eb52142..5364659156 100644 --- a/.github/workflows/miniooni.yml +++ b/.github/workflows/miniooni.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/miniooni diff --git a/.github/workflows/netxlite.yml b/.github/workflows/netxlite.yml index 56d4e21ac9..0b0f03b9bf 100644 --- a/.github/workflows/netxlite.yml +++ b/.github/workflows/netxlite.yml @@ -11,7 +11,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - go: [ "1.17.2" ] + go: [ "1.17.3" ] os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ] steps: - uses: actions/setup-go@v1 diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml index cc881f0593..c688d07a03 100644 --- a/.github/workflows/oohelperd.yml +++ b/.github/workflows/oohelperd.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - name: build oohelperd binary run: GOOS=linux GOARCH=amd64 go build -v ./internal/cmd/oohelperd diff --git a/.github/workflows/qafbmessenger.yml b/.github/workflows/qafbmessenger.yml index c27f58b1c6..d03c781dea 100644 --- a/.github/workflows/qafbmessenger.yml +++ b/.github/workflows/qafbmessenger.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "fbmessenger" diff --git a/.github/workflows/qahhfm.yml b/.github/workflows/qahhfm.yml index 46a6a3ef80..ea2567d7ec 100644 --- a/.github/workflows/qahhfm.yml +++ b/.github/workflows/qahhfm.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hhfm" diff --git a/.github/workflows/qahirl.yml b/.github/workflows/qahirl.yml index 1260f84f07..c8de85702c 100644 --- a/.github/workflows/qahirl.yml +++ b/.github/workflows/qahirl.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hirl" diff --git a/.github/workflows/qatelegram.yml b/.github/workflows/qatelegram.yml index 83130a6f2f..e7838e5470 100644 --- a/.github/workflows/qatelegram.yml +++ b/.github/workflows/qatelegram.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "telegram" diff --git a/.github/workflows/qawebconnectivity.yml b/.github/workflows/qawebconnectivity.yml index c02c953384..a4b907a9d9 100644 --- a/.github/workflows/qawebconnectivity.yml +++ b/.github/workflows/qawebconnectivity.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "webconnectivity" diff --git a/.github/workflows/qawhatsapp.yml b/.github/workflows/qawhatsapp.yml index 31306ff5df..53d9c2639f 100644 --- a/.github/workflows/qawhatsapp.yml +++ b/.github/workflows/qawhatsapp.yml @@ -11,6 +11,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "whatsapp" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 52ee8336cb..c5f05873bc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.17.2" + go-version: "1.17.3" - uses: actions/checkout@v2 - run: sudo apt install mingw-w64 - run: ./mk OONI_PSIPHON_TAGS="" MINGW_W64_VERSION="9.3-win32" ./CLI/windows/amd64/ooniprobe.exe diff --git a/go.mod b/go.mod index ce44ef0722..d6306b02f5 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 github.com/montanaflynn/stats v0.6.6 github.com/onsi/ginkgo v1.16.5 // indirect - github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e + github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6 github.com/ooni/probe-assets v0.5.0 github.com/ooni/psiphon v0.9.0 github.com/oschwald/geoip2-golang v1.5.0 @@ -49,7 +49,7 @@ require ( gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/mod v0.5.1 // indirect - golang.org/x/net v0.0.0-20211020060615-d418f374d309 + golang.org/x/net v0.0.0-20211109214657-ef0fda0de508 golang.org/x/sys v0.0.0-20211020064051-0ec99a608a1b golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.7 // indirect diff --git a/go.sum b/go.sum index bcd47b876f..9025c2e079 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,8 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e h1:qxMkCUolEF15N0t/z823I4eRwYIih+nglhcWWfeg3WU= -github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e/go.mod h1:kgtoj+Dn4bmx09hEUgbPI7YX0gkWlu+fz2I0S5auyX4= +github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6 h1:o1Uwpkw+KfJEhiqhnfcEIkXNVnyV6tVgllATZEWmNGw= +github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6/go.mod h1:kgtoj+Dn4bmx09hEUgbPI7YX0gkWlu+fz2I0S5auyX4= github.com/ooni/probe-assets v0.5.0 h1:4pfiyYaWfWaK4isokNAEYOwHqOISTOqm2kd/2MquWh8= github.com/ooni/probe-assets v0.5.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo= github.com/ooni/psiphon v0.9.0 h1:THWP09pYSKzoq9RIKZWuz9367ho9bri9lKxkMu8VsM8= @@ -765,8 +765,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211109214657-ef0fda0de508 h1:v3NKo+t/Kc3EASxaKZ82lwK6mCf4ZeObQBduYFZHo7c= +golang.org/x/net v0.0.0-20211109214657-ef0fda0de508/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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=