diff options
author | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:43 -0500 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:43 -0500 |
commit | bfd1d702433fde0c551a1c79d410d87fe22feb30 (patch) | |
tree | 0a5808d7457f072257dc999dfa0c3617acbd0656 | |
parent | d9010c5b67a60e9f0b9051ba6597005e33e58266 (diff) | |
parent | bca25eebfbc9e80665d63bbe02ba5ce21081eab1 (diff) | |
download | tor-bfd1d702433fde0c551a1c79d410d87fe22feb30.tar.gz tor-bfd1d702433fde0c551a1c79d410d87fe22feb30.zip |
Merge branch 'maint-0.3.5'
-rw-r--r-- | changes/bug29244 | 4 | ||||
-rw-r--r-- | src/rust/Cargo.lock | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug29244 b/changes/bug29244 new file mode 100644 index 0000000000..6206a95463 --- /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 7d6a6635c5..e2f24b0af7 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 = "crypto" version = "0.0.1" |