diff options
| author | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:02 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:10:02 -0500 |
| commit | d0f969a43708436e0e4c7181f0426b497649bc42 (patch) | |
| tree | 4c823dd4197d4d11c4fc921500295228151a4a3f | |
| parent | 6f22a0c157fb6af1d05c7146d6d9539daf95b2c5 (diff) | |
| parent | 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f (diff) | |
| download | tor-d0f969a43708436e0e4c7181f0426b497649bc42.tar.gz tor-d0f969a43708436e0e4c7181f0426b497649bc42.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -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 1d2a7359aa..3a067a39dc 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" |