diff --git a/build.sh b/build.sh index e35e70552ca97b04adc2bd5d2be42efa69fca0b6..5e1770e540cd57ba9460c0b49d7fa9ee52ab3b21 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ else # No .git directory - That's a normal install. git clone https://gitlab.com/yawning/obfs4.git cd obfs4 || exit 1 - git checkout --force --quiet 77af0cba + git checkout --force --quiet 336a71d6 cd .. git clone https://git.torproject.org/pluggable-transports/snowflake.git cd snowflake || exit 1 diff --git a/obfs4 b/obfs4 index 77af0cba934d73c4baeb709560bcfc9a9fbc661c..336a71d6e4cfd2d33e9c57797828007ad74975e9 160000 --- a/obfs4 +++ b/obfs4 @@ -1 +1 @@ -Subproject commit 77af0cba934d73c4baeb709560bcfc9a9fbc661c +Subproject commit 336a71d6e4cfd2d33e9c57797828007ad74975e9 diff --git a/obfs4.patch b/obfs4.patch index 1776f08c010dd12f68a8970344123160c88d28db..f10da5755ca57739cc7b686076bca1435183b48e 100644 --- a/obfs4.patch +++ b/obfs4.patch @@ -1,5 +1,5 @@ diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go -index d92f5f5..d849b80 100644 +index f295926..5a2ce99 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -27,10 +27,9 @@ @@ -25,8 +25,8 @@ index d92f5f5..d849b80 100644 @@ -51,6 +51,7 @@ import ( const ( - obfs4proxyVersion = "0.0.13" -+ Obfs4proxyVersion = obfs4proxyVersion + obfs4proxyVersion = "0.0.14" ++ Obfs4proxyVersion = obfs4proxyVersion obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" )