diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-03-21 17:05:42 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-03-21 17:05:42 -0400 |
commit | 03e787e220a92996ecca1c9bc262f29ee37ececc (patch) | |
tree | 80d555623548c6527ae0b69c32f5c2ed504c0743 /src/rust | |
parent | 2c36a02bb148e7331675f65628939dec448a8db1 (diff) | |
parent | 95b78d4178a07b9b33782a2d3193aa176a88ca80 (diff) | |
download | tor-03e787e220a92996ecca1c9bc262f29ee37ececc.tar.gz tor-03e787e220a92996ecca1c9bc262f29ee37ececc.zip |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/rust')
-rw-r--r-- | src/rust/Cargo.lock | 29 | ||||
-rw-r--r-- | src/rust/external/Cargo.toml | 2 | ||||
-rw-r--r-- | src/rust/protover/Cargo.toml | 2 | ||||
-rw-r--r-- | src/rust/smartlist/Cargo.toml | 2 | ||||
-rw-r--r-- | src/rust/tor_allocate/Cargo.toml | 2 | ||||
-rw-r--r-- | src/rust/tor_util/Cargo.toml | 2 |
6 files changed, 19 insertions, 20 deletions
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 116ef17f1c..717add222f 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,22 +1,13 @@ -[root] -name = "tor_util" -version = "0.0.1" -dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tor_allocate 0.0.1", - "tor_log 0.1.0", -] - [[package]] name = "external" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.22" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -24,7 +15,7 @@ name = "protover" version = "0.0.1" dependencies = [ "external 0.0.1", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", "tor_allocate 0.0.1", "tor_log 0.1.0", @@ -35,14 +26,14 @@ dependencies = [ name = "smartlist" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tor_allocate" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -61,5 +52,13 @@ dependencies = [ "tor_util 0.0.1", ] +[[package]] +name = "tor_util" +version = "0.0.1" +dependencies = [ + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "tor_allocate 0.0.1", +] + [metadata] -"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" +"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml index bccd7033a7..b5957b1079 100644 --- a/src/rust/external/Cargo.toml +++ b/src/rust/external/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "external" [dependencies] -libc = "0.2.22" +libc = "=0.2.39" [lib] name = "external" diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml index 3f70155ef8..af1089c914 100644 --- a/src/rust/protover/Cargo.toml +++ b/src/rust/protover/Cargo.toml @@ -7,7 +7,7 @@ name = "protover" testing = ["tor_log/testing"] [dependencies] -libc = "0.2.22" +libc = "=0.2.39" [dependencies.smartlist] path = "../smartlist" diff --git a/src/rust/smartlist/Cargo.toml b/src/rust/smartlist/Cargo.toml index 51f486c4d7..6ddcbee8e9 100644 --- a/src/rust/smartlist/Cargo.toml +++ b/src/rust/smartlist/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "smartlist" [dependencies] -libc = "0.2.22" +libc = "0.2.39" [lib] name = "smartlist" diff --git a/src/rust/tor_allocate/Cargo.toml b/src/rust/tor_allocate/Cargo.toml index ceb08b78ab..468425f115 100644 --- a/src/rust/tor_allocate/Cargo.toml +++ b/src/rust/tor_allocate/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "tor_allocate" [dependencies] -libc = "0.2.22" +libc = "=0.2.39" [lib] name = "tor_allocate" diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml index adc3390b53..a606a280b2 100644 --- a/src/rust/tor_util/Cargo.toml +++ b/src/rust/tor_util/Cargo.toml @@ -15,5 +15,5 @@ path = "../tor_allocate" path = "../tor_log" [dependencies] -libc = "0.2.22" +libc = "=0.2.39" |