February 2019 - tor-commits - lists.torproject.org

[obfs4/master] transports/meeklite: Bump the tag for the utls fork
by yawning＠torproject.org 05 Feb '19

05 Feb '19

commit 8abd3aa95f2faac1c1ccf34b0bf738b59ca3fc31 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 5 14:27:04 2019 +0000 transports/meeklite: Bump the tag for the utls fork Upstream fixed a bug, so use a tag that has the important parts cherry-picked. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cd7f631..422ac26 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20190117054722-15f83653abbc github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 github.com/dchest/siphash v1.2.1 - gitlab.com/yawning/utls.git v0.0.9-1 + gitlab.com/yawning/utls.git v0.0.9-2 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 golang.org/x/net v0.0.0-20190119204137-ed066c81e75e golang.org/x/text v0.3.0 // indirect diff --git a/go.sum b/go.sum index bc5369c..03020e0 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac= github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s= -gitlab.com/yawning/utls.git v0.0.9-1 h1:qM3iQLFVKtBPP4THo7QQvHZanP2Vk9jAgDZaUTsAuE4= -gitlab.com/yawning/utls.git v0.0.9-1/go.mod h1:PuJDGdGVFPpgc2evhLjHRgl5ZN2sItpDiydweKFYtuc= +gitlab.com/yawning/utls.git v0.0.9-2 h1:Eluu5djPH7CKcmGX14AX28eqKgHrBSQIc1RCAUROxVQ= +gitlab.com/yawning/utls.git v0.0.9-2/go.mod h1:PuJDGdGVFPpgc2evhLjHRgl5ZN2sItpDiydweKFYtuc= golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc= golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q=

1 0

[obfs4/master] Do the release ritual for obfs4proxy-0.0.9
by yawning＠torproject.org 05 Feb '19

05 Feb '19

commit 8a19b4fcb16d6e75932a6aa91c414594fdd92562 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 5 14:29:08 2019 +0000 Do the release ritual for obfs4proxy-0.0.9 --- ChangeLog | 2 +- obfs4proxy/obfs4proxy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0df8124..0c3cd51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.9 - UNRELEASED: +Changes in version 0.0.9 - 2019-02-05: - Various meek_lite code cleanups and bug fixes. - Bug 29077: uTLS for ClientHello camouflage (meek_lite). - More fixes to HTTP Basic auth. diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index be29d74..82dc456 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -50,7 +50,7 @@ import ( ) const ( - obfs4proxyVersion = "0.0.9-dev" + obfs4proxyVersion = "0.0.9" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" )

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f Merge: 1c5f03fba 4d7a0a131 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:09:47 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --cc src/rust/Cargo.lock index 1d2a7359a,d2fd37e40..3a067a39d --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,26 -1,6 +1,28 @@@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. [[package]] +name = "crypto" +version = "0.0.1" +dependencies = [ + "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "external 0.0.1", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smartlist 0.0.1", + "tor_allocate 0.0.1", + "tor_log 0.1.0", +] + +[[package]] +name = "digest" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "external" version = "0.0.1" dependencies = [

1 0

[tor/maint-0.3.4] Update Cargo.lock with new comment; suppress 29244.
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 4d7a0a1310886c6b27505aeea1ac54e811e7dbf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 16:38:23 2019 +0100 Update Cargo.lock with new comment; suppress 29244. --- changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/bug29244 b/changes/bug29244 new file mode 100644 index 000000000..6206a9546 --- /dev/null +++ b/changes/bug29244 @@ -0,0 +1,4 @@ + o Minor bugfixes (build, compatibility): + - Update Cargo.lock file to match the version made by the latest + version of Rust, so that "make distcheck" will pass again. + Fixes bug 29244; bugfix on 0.3.3.4-alpha. diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 4f918c022..d2fd37e40 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "external" version = "0.0.1"

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f Merge: 1c5f03fba 4d7a0a131 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:09:47 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --cc src/rust/Cargo.lock index 1d2a7359a,d2fd37e40..3a067a39d --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,26 -1,6 +1,28 @@@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. [[package]] +name = "crypto" +version = "0.0.1" +dependencies = [ + "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "external 0.0.1", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smartlist 0.0.1", + "tor_allocate 0.0.1", + "tor_log 0.1.0", +] + +[[package]] +name = "digest" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "external" version = "0.0.1" dependencies = [

1 0

[tor/maint-0.3.5] Update Cargo.lock with new comment; suppress 29244.
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 4d7a0a1310886c6b27505aeea1ac54e811e7dbf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 16:38:23 2019 +0100 Update Cargo.lock with new comment; suppress 29244. --- changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/bug29244 b/changes/bug29244 new file mode 100644 index 000000000..6206a9546 --- /dev/null +++ b/changes/bug29244 @@ -0,0 +1,4 @@ + o Minor bugfixes (build, compatibility): + - Update Cargo.lock file to match the version made by the latest + version of Rust, so that "make distcheck" will pass again. + Fixes bug 29244; bugfix on 0.3.3.4-alpha. diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 4f918c022..d2fd37e40 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "external" version = "0.0.1"

1 0

[tor/maint-0.3.3] Update Cargo.lock with new comment; suppress 29244.
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 4d7a0a1310886c6b27505aeea1ac54e811e7dbf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 16:38:23 2019 +0100 Update Cargo.lock with new comment; suppress 29244. --- changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/bug29244 b/changes/bug29244 new file mode 100644 index 000000000..6206a9546 --- /dev/null +++ b/changes/bug29244 @@ -0,0 +1,4 @@ + o Minor bugfixes (build, compatibility): + - Update Cargo.lock file to match the version made by the latest + version of Rust, so that "make distcheck" will pass again. + Fixes bug 29244; bugfix on 0.3.3.4-alpha. diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 4f918c022..d2fd37e40 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "external" version = "0.0.1"

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f Merge: 1c5f03fba 4d7a0a131 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:09:47 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --cc src/rust/Cargo.lock index 1d2a7359a,d2fd37e40..3a067a39d --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,26 -1,6 +1,28 @@@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. [[package]] +name = "crypto" +version = "0.0.1" +dependencies = [ + "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "external 0.0.1", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smartlist 0.0.1", + "tor_allocate 0.0.1", + "tor_log 0.1.0", +] + +[[package]] +name = "digest" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "external" version = "0.0.1" dependencies = [

1 0

[tor/master] Update Cargo.lock with new comment; suppress 29244.
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 4d7a0a1310886c6b27505aeea1ac54e811e7dbf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 1 16:38:23 2019 +0100 Update Cargo.lock with new comment; suppress 29244. --- changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/bug29244 b/changes/bug29244 new file mode 100644 index 000000000..6206a9546 --- /dev/null +++ b/changes/bug29244 @@ -0,0 +1,4 @@ + o Minor bugfixes (build, compatibility): + - Update Cargo.lock file to match the version made by the latest + version of Rust, so that "make distcheck" will pass again. + Fixes bug 29244; bugfix on 0.3.3.4-alpha. diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 4f918c022..d2fd37e40 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "external" version = "0.0.1"

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit bca25eebfbc9e80665d63bbe02ba5ce21081eab1 Merge: 712a622fc 8ea98c0f4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:10:14 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)

1 0