Skip to content

Commit

Permalink
Revert last three commits (faulty?)
Browse files Browse the repository at this point in the history
We lost all legacy traffic after the changes from today got deployed. This
reverts those changes.
This reverts commit 9f16767.

Revert "Upgrade broflake (#593)"

This reverts commit da89e1d.

Revert "bump quic and broflake (#592)"

This reverts commit c8f2d00.
  • Loading branch information
Crosse committed Nov 18, 2023
1 parent 9f16767 commit 986f8a0
Show file tree
Hide file tree
Showing 9 changed files with 564 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.21
go-version: 1.19
- name: Granting private modules access
run: |
git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.3
FROM --platform=$BUILDPLATFORM golang:1.21-alpine as builder
FROM --platform=$BUILDPLATFORM golang:1.19-alpine as builder
ARG TARGETOS TARGETARCH

WORKDIR $GOPATH/src/getlantern/http-proxy-lantern/
Expand Down
19 changes: 13 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
module github.com/getlantern/http-proxy-lantern/v2

go 1.21
go 1.19

require (
cloud.google.com/go/errorreporting v0.3.0
git.torproject.org/pluggable-transports/goptlib.git v1.2.0
github.com/Jigsaw-Code/outline-ss-server v1.4.0
github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23
github.com/OperatorFoundation/Starbridge-go/Starbridge/v3 v3.0.17
github.com/blang/semver v3.5.1+incompatible
github.com/dustin/go-humanize v1.0.1
github.com/getlantern/broflake v0.0.0-20231117182649-7d46643a6f87
github.com/getlantern/broflake v0.0.0-20231016221059-9c3632502cae
github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0
github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54
github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033
Expand All @@ -33,24 +34,27 @@ require (
github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360
github.com/getlantern/proxy/v3 v3.0.0-20231031142453-252ab678e6b7
github.com/getlantern/psmux v1.5.15
github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970
github.com/getlantern/quicwrapper v0.0.0-20230523101504-1ec066b7f869
github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7
github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461
github.com/getlantern/tlsdefaults v0.0.0-20171004213447-cf35cfd0b1b4
github.com/getlantern/tlsmasq v0.4.7-0.20230302000139-6e479a593298
github.com/getlantern/tlsutil v0.5.3
github.com/getlantern/waitforserver v1.0.1
github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913
github.com/go-redis/redis/v8 v8.11.5
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/hashicorp/golang-lru v0.5.4
github.com/mitchellh/panicwrap v1.0.0
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/quic-go/quic-go v0.34.0
github.com/refraction-networking/utls v1.3.3
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
github.com/spaolacci/murmur3 v1.1.0
github.com/stretchr/testify v1.8.4
github.com/vharitonsky/iniflags v0.0.0-20180513140207-a33cd0b5f3de
github.com/xtaci/smux v1.5.24
gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
Expand All @@ -66,6 +70,7 @@ require (
require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/OperatorFoundation/ghostwriter-go v1.0.6 // indirect
github.com/OperatorFoundation/go-bloom v1.0.1 // indirect
github.com/OperatorFoundation/go-shadowsocks2 v1.2.1 // indirect
Expand All @@ -76,6 +81,7 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/siphash v1.2.3 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72 // indirect
Expand Down Expand Up @@ -106,6 +112,7 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
Expand Down Expand Up @@ -152,8 +159,8 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
github.com/quic-go/quic-go v0.40.0 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/shadowsocks/go-shadowsocks2 v0.1.4-0.20201002022019-75d43273f5a5 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect
Expand All @@ -167,12 +174,12 @@ require (
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/mock v0.3.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
Expand Down
Loading

0 comments on commit 986f8a0

Please sign in to comment.