torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson
2018-03-21 17:05:42 -04:00
parent 2c36a02bb1 95b78d4178
commit 03e787e220
9 changed files with 101 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rust/Cargo.lock
Generated
+14 -15
View File
@@ -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"
src/rust/external/Cargo.toml
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ version = "0.0.1"
name = "external"
[dependencies]
libc = "0.2.22"
libc = "=0.2.39"
[lib]
name = "external"
src/rust/protover/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ name = "protover"
testing = ["tor_log/testing"]
[dependencies]
libc = "0.2.22"
libc = "=0.2.39"
[dependencies.smartlist]
path = "../smartlist"
src/rust/smartlist/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@ version = "0.0.1"
name = "smartlist"
[dependencies]
libc = "0.2.22"
libc = "0.2.39"
[lib]
name = "smartlist"
src/rust/tor_allocate/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@ version = "0.0.1"
name = "tor_allocate"
[dependencies]
libc = "0.2.22"
libc = "=0.2.39"
[lib]
name = "tor_allocate"
src/rust/tor_util/Cargo.toml
+1 -1
View File
@@ -15,5 +15,5 @@ path = "../tor_allocate"
path = "../tor_log"
[dependencies]
libc = "0.2.22"
libc = "=0.2.39"