diff options
| author | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:30 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:30 -0500 |
| commit | 1cc234ed00035f35779ff32a8032dea1775be937 (patch) | |
| tree | 8931e856f061c33e1bb684369a32486a93854c50 | |
| parent | 589b60d9e071cbf27e8a45daccf926c4ea55bac8 (diff) | |
| parent | bca25eebfbc9e80665d63bbe02ba5ce21081eab1 (diff) | |
| download | tor-1cc234ed00035f35779ff32a8032dea1775be937.tar.gz tor-1cc234ed00035f35779ff32a8032dea1775be937.zip | |
Merge branch 'maint-0.3.5' into release-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" |