Verified Commit fc319720 authored by meskio's avatar meskio 🏔️
Browse files

Merge remote-tracking branches 'origin/mr/53' and 'origin/mr/54'

parents 4957132a 9ba52e9d

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ require ( 
	github.com/refraction-networking/utls v1.6.3

	gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266

	gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0

	gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240507101150-3b6faa481637

	gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240711104640-e64b1b3562f3

	golang.org/x/crypto v0.25.0

	golang.org/x/net v0.27.0

)

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266 h1:Ivjs 
gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266/go.mod h1:K/3SQWdJL6udzwInHk1gaYaECYxMp9dDayniPq6gCSo=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 h1:rzdY78Ox2T+VlXcxGxELF+6VyUXlZBhmRqZu5etLm+c=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0/go.mod h1:70bhd4JKW/+1HLfm+TMrgHJsUHG4coelMWwiVEJ2gAg=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240507101150-3b6faa481637 h1:ImLeViKIxpIBTPY38iZOQWbserizqwQhmvSdPOeS+NI=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240507101150-3b6faa481637/go.mod h1:wqPdBpeGYh9E4V9l4YFU3US9Thu4jaahPDbMRmM906M=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240711104640-e64b1b3562f3 h1:1sjrPMDqd/vG8VWf7WYL2K8BqbcO0MSfB4xdv39zlSU=

gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240711104640-e64b1b3562f3/go.mod h1:aEzSbkzOc38Cg7gLg0BmRDwQgxwjbbKSiAv052xTS7I=

golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=