May 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 May '18

16 May '18

commit d3a972561aeb38d7b346be1826054c60bf3adfaa Merge: 502d2c006 d1e4ffc71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 16 May '18

16 May '18

commit 8340f641c30f8e529b513732be2c931e128227e2 Merge: 4aa3d511b d3a972561 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 May '18

16 May '18

commit 3c4353179f2304767f5084734a7d1550f51f4542 Merge: 6acbd4c11 8340f641c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 16 May '18

16 May '18

commit ad5b4c4085e9fd9a7f318f58fd6a54166ff6078a Merge: ca63a6660 3c4353179 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor-browser-build/maint-7.5] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit efa9901ec57d0d78aa1f8034a922da4f792c0ee0 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit 22af54508a1e98bec13ee9580aac7c1b907043e8 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor/master] rust: Make Rng::new() methods public.
by nickm＠torproject.org 16 May '18

16 May '18

commit 2ac849da36ade48ae1d8cd7e1546549615785ae3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 15 01:45:29 2018 +0000 rust: Make Rng::new() methods public. --- src/rust/rand/rng.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/rand/rng.rs b/src/rust/rand/rng.rs index cfd96c961..d5fae8a32 100644 --- a/src/rust/rand/rng.rs +++ b/src/rust/rand/rng.rs @@ -43,7 +43,7 @@ mod internal { impl TorRng { // C_RUST_COUPLED: `crypto_seed_rng()` /src/common/crypto_rand.c #[allow(dead_code)] - fn new() -> Self { + pub fn new() -> Self { if !c_tor_crypto_seed_rng() { tor_log_msg!(LogSeverity::Warn, LogDomain::General, "TorRng::from_seed()", @@ -90,7 +90,7 @@ mod internal { impl TorStrongestRng { // C_RUST_COUPLED: `crypto_seed_rng()` /src/common/crypto_rand.c #[allow(dead_code)] - fn new() -> Self { + pub fn new() -> Self { if !c_tor_crypto_seed_rng() { tor_log_msg!(LogSeverity::Warn, LogDomain::General, "TorStrongestRng::from_seed()",

1 0

[tor/master] rust: Move rand crate into crypto parent crate.
by nickm＠torproject.org 16 May '18

16 May '18

commit 9988882c6399b9b54d50f22617f3358bec4cb89b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 15 02:02:02 2018 +0000 rust: Move rand crate into crypto parent crate. --- src/rust/Cargo.lock | 17 ++++------------- src/rust/Cargo.toml | 1 - src/rust/crypto/Cargo.toml | 15 +++++++++++---- src/rust/{rand/lib.rs => crypto/rand/mod.rs} | 0 src/rust/{ => crypto}/rand/rng.rs | 0 src/rust/include.am | 5 ++--- src/rust/rand/Cargo.toml | 27 --------------------------- 7 files changed, 17 insertions(+), 48 deletions(-) diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index ddbc0ac2b..769e2c39c 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -5,7 +5,11 @@ 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.1.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]] @@ -51,19 +55,6 @@ dependencies = [ [[package]] name = "rand" -version = "0.0.1" -dependencies = [ - "external 0.0.1", - "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tor_allocate 0.0.1", - "tor_log 0.1.0", - "tor_util 0.0.1", -] - -[[package]] -name = "rand" version = "0.5.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 1aaab0c4f..c3e44d2a7 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -3,7 +3,6 @@ members = [ "crypto", "external", "protover", - "rand", "smartlist", "tor_allocate", "tor_log", diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index e6a8bffa2..8b489dfb4 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -13,9 +13,16 @@ crate_type = ["rlib", "staticlib"] [dependencies] libc = "=0.2.39" digest = "=0.7.2" +rand_core = "=0.1.0" -[dependencies.external] -path = "../external" +external = { path = "../external" } +smartlist = { path = "../smartlist" } +tor_allocate = { path = "../tor_allocate" } +tor_log = { path = "../tor_log" } + +[dev-dependencies] +rand = { version = "=0.5.0-pre.1", default-features = false } + +[features] +testing = ["tor_log/testing"] -[dependencies.smartlist] -path = "../smartlist" diff --git a/src/rust/rand/lib.rs b/src/rust/crypto/rand/mod.rs similarity index 100% rename from src/rust/rand/lib.rs rename to src/rust/crypto/rand/mod.rs diff --git a/src/rust/rand/rng.rs b/src/rust/crypto/rand/rng.rs similarity index 100% rename from src/rust/rand/rng.rs rename to src/rust/crypto/rand/rng.rs diff --git a/src/rust/include.am b/src/rust/include.am index ba652bda0..5fd9741e0 100644 --- a/src/rust/include.am +++ b/src/rust/include.am @@ -8,6 +8,8 @@ EXTRA_DIST +=\ src/rust/crypto/lib.rs \ src/rust/crypto/digests/mod.rs \ src/rust/crypto/digests/sha2.rs \ + src/rust/crypto/rand/mod.rs \ + src/rust/crypto/rand/rng.rs \ src/rust/external/Cargo.toml \ src/rust/external/crypto_digest.rs \ src/rust/external/crypto_rand.rs \ @@ -20,9 +22,6 @@ EXTRA_DIST +=\ src/rust/protover/lib.rs \ src/rust/protover/protover.rs \ src/rust/protover/tests/protover.rs \ - src/rust/rand/Cargo.toml \ - src/rust/rand/lib.rs \ - src/rust/rand/rng.rs \ src/rust/smartlist/Cargo.toml \ src/rust/smartlist/lib.rs \ src/rust/smartlist/smartlist.rs \ diff --git a/src/rust/rand/Cargo.toml b/src/rust/rand/Cargo.toml deleted file mode 100644 index b5bbf5c1b..000000000 --- a/src/rust/rand/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -# TODO: Note that this package should be merged into the "crypto" crate after #24659 is merged. - -[package] -authors = ["The Tor Project"] -version = "0.0.1" -name = "rand" -publish = false - -[features] -testing = ["tor_log/testing"] - -[dependencies] -libc = "=0.2.39" -rand_core = "=0.1.0" - -external = { path = "../external" } -tor_allocate = { path = "../tor_allocate" } -tor_log = { path = "../tor_log" } -tor_util = { path = "../tor_util" } - -[dev-dependencies] -rand = { version = "=0.5.0-pre.1", default-features = false } - -[lib] -name = "rand" -path = "lib.rs" -crate_type = ["rlib", "staticlib"]

1 0

[tor/master] rust: Update rand dev-dependency to 0.5.0-pre.2.
by nickm＠torproject.org 16 May '18

16 May '18

commit 760cf8e28f7319e924366a97be8882e2b04db49a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 15 19:31:29 2018 +0000 rust: Update rand dev-dependency to 0.5.0-pre.2. --- src/rust/Cargo.lock | 14 ++++++++++---- src/rust/crypto/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 769e2c39c..a16ffc4ef 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -5,7 +5,7 @@ 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.1 (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.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", "tor_allocate 0.0.1", @@ -55,10 +55,10 @@ dependencies = [ [[package]] name = "rand" -version = "0.5.0-pre.1" +version = "0.5.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.1.0 (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)", ] [[package]] @@ -67,6 +67,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "rand_core" +version = "0.2.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "smartlist" version = "0.0.1" dependencies = [ @@ -114,6 +119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" "checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" -"checksum rand 0.5.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7d7a7728c20bfd9fcc6e713e748e787c3d00e5ffd139b3ad1b5be92c5dfbaad5" +"checksum rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3795e4701d9628a63a84d0289e66279883b40df165fca7caed7b87122447032a" "checksum rand_core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0224284424a4b818387b58d59336c288f99b48f69681aa60cc681fe038bbca5d" +"checksum rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7255ffbdb188d5be1a69b6f9f3cf187de4207430b9e79ed5b76458a6b20de9a" "checksum typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a99dc6780ef33c78780b826cf9d2a78840b72cae9474de4bcaf9051e60ebbd" diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index 8b489dfb4..508c288aa 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -21,7 +21,7 @@ tor_allocate = { path = "../tor_allocate" } tor_log = { path = "../tor_log" } [dev-dependencies] -rand = { version = "=0.5.0-pre.1", default-features = false } +rand = { version = "=0.5.0-pre.2", default-features = false } [features] testing = ["tor_log/testing"]

1 0

[tor/master] rust: Update rand_core dependency to 0.2.0-pre.0.
by nickm＠torproject.org 16 May '18

16 May '18

commit 4d349c6a6124b8d94dc787f0076c15b896272363 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 15 19:33:20 2018 +0000 rust: Update rand_core dependency to 0.2.0-pre.0. --- src/rust/Cargo.lock | 8 +------- src/rust/crypto/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index a16ffc4ef..1d2a7359a 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -6,7 +6,7 @@ dependencies = [ "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.1.0 (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", @@ -63,11 +63,6 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "rand_core" version = "0.2.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -120,6 +115,5 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" "checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" "checksum rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3795e4701d9628a63a84d0289e66279883b40df165fca7caed7b87122447032a" -"checksum rand_core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0224284424a4b818387b58d59336c288f99b48f69681aa60cc681fe038bbca5d" "checksum rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7255ffbdb188d5be1a69b6f9f3cf187de4207430b9e79ed5b76458a6b20de9a" "checksum typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a99dc6780ef33c78780b826cf9d2a78840b72cae9474de4bcaf9051e60ebbd" diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index 508c288aa..3d343344a 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -13,7 +13,7 @@ crate_type = ["rlib", "staticlib"] [dependencies] libc = "=0.2.39" digest = "=0.7.2" -rand_core = "=0.1.0" +rand_core = "=0.2.0-pre.0" external = { path = "../external" } smartlist = { path = "../smartlist" }

1 0