diff options
| author | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:09:27 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2019-02-05 08:09:27 -0500 |
| commit | 9348742012c8df6047be84d1ea11f2b9bfba8444 (patch) | |
| tree | 5bfa68a28c7756ecdd3aaf683cb235555a4f53b9 | |
| parent | d213fbda2f2aaaf54c0d609f8afe5fd74ad944a9 (diff) | |
| parent | 4d7a0a1310886c6b27505aeea1ac54e811e7dbf0 (diff) | |
| download | tor-9348742012c8df6047be84d1ea11f2b9bfba8444.tar.gz tor-9348742012c8df6047be84d1ea11f2b9bfba8444.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -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 4f918c0221..d2fd37e400 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 = "external" version = "0.0.1" |