This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main in repository pluggable-transports/snowflake.

The following commit(s) were added to refs/heads/main by this push: new 297ca91 Use goptlib from gitlab.torproject.org 297ca91 is described below

commit 297ca91b1d2937b3b63f397adcfd628d1597a029 Author: meskio meskio@torproject.org AuthorDate: Wed Apr 19 12:26:06 2023 +0200

Use goptlib from gitlab.torproject.org --- client/snowflake.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- server/server.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/snowflake.go b/client/snowflake.go index 7568c4e..5db9b44 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -16,11 +16,11 @@ import ( "sync" "syscall"

- pt "git.torproject.org/pluggable-transports/goptlib.git" sf "git.torproject.org/pluggable-transports/snowflake.git/v2/client/lib" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" + pt "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib" )

const ( diff --git a/go.mod b/go.mod index eca8551..8f18d6f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module git.torproject.org/pluggable-transports/snowflake.git/v2 go 1.15

require ( - git.torproject.org/pluggable-transports/goptlib.git v1.3.0 github.com/clarkduvall/hyperloglog v0.0.0-20171127014514-a0107a5d8004 github.com/gorilla/websocket v1.5.0 github.com/pion/ice/v2 v2.3.1 @@ -18,6 +17,7 @@ require ( github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/smux v1.5.15 gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01 + gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0 golang.org/x/crypto v0.6.0 golang.org/x/net v0.7.0 google.golang.org/protobuf v1.26.0 diff --git a/go.sum b/go.sum index 6498527..9a0a186 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -git.torproject.org/pluggable-transports/goptlib.git v1.3.0 h1:G+iuRUblCCC2xnO+0ag1/4+aaM98D5mjWP1M0v9s8a0= -git.torproject.org/pluggable-transports/goptlib.git v1.3.0/go.mod h1:4PBMl1dg7/3vMWSoWb46eGWlrxkUyn/CAJmxhDLAlDs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -362,6 +360,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01 h1:4949mHh9Vj2/okk48yG8nhP6TosFWOUfSfSr502sKGE= gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01/go.mod h1:K3LOI4H8fa6j+7E10ViHeGEQV10304FG4j94ypmKLjY= +gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0 h1:Y7fHDMy11yyjM+YlHfcM3svaujdL+m5DqS444wbj8o4= +gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0/go.mod h1:70bhd4JKW/+1HLfm+TMrgHJsUHG4coelMWwiVEJ2gAg= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= diff --git a/server/server.go b/server/server.go index 912fead..d79916b 100644 --- a/server/server.go +++ b/server/server.go @@ -23,8 +23,8 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" "golang.org/x/crypto/acme/autocert"

- pt "git.torproject.org/pluggable-transports/goptlib.git" sf "git.torproject.org/pluggable-transports/snowflake.git/v2/server/lib" + pt "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib" )

const ptMethodName = "snowflake"