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

[tor/master] 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

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

05 Feb '19

commit bfd1d702433fde0c551a1c79d410d87fe22feb30 Merge: d9010c5b6 bca25eebf Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:10:43 2019 -0500 Merge branch 'maint-0.3.5' changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/release-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/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 9348742012c8df6047be84d1ea11f2b9bfba8444 Merge: d213fbda2 4d7a0a131 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:09:27 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/release-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/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by arma＠torproject.org 05 Feb '19

05 Feb '19

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

1 0

[tor/release-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/release-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

[tor/release-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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by arma＠torproject.org 05 Feb '19

05 Feb '19

commit 1cc234ed00035f35779ff32a8032dea1775be937 Merge: 589b60d9e bca25eebf Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 5 08:10:30 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)

1 0