Merge remote-tracking branches 'gitlab/mr/405' and 'gitlab/mr/410'

This commit is contained in:
meskio 2024-10-08 12:19:03 +02:00
commit 177a6bdf68
No known key found for this signature in database
GPG key ID: 52B8F5AC97A2DA86
2 changed files with 9 additions and 9 deletions

6
go.mod
View file

@ -26,9 +26,9 @@ require (
gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/ptutil v0.0.0-20240710081135-6c4d8ed41027
golang.org/x/crypto v0.27.0
golang.org/x/crypto v0.28.0
golang.org/x/net v0.28.0
golang.org/x/sys v0.25.0
golang.org/x/sys v0.26.0
)
require (
@ -82,7 +82,7 @@ require (
github.com/wlynxg/anet v0.0.3 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect