diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-28 08:11:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-28 08:11:46 -0400 |
| commit | a3c1d78c29a6827f623c83ca8f45798019206bc9 (patch) | |
| tree | a864a3b750187efb85619b33a9e8b42312f27d01 | |
| parent | 6317aa2cc03a3b7a6f9fd4a4bdd99447f7914493 (diff) | |
| parent | 3cc382b93e6ae55b86c50463493507c6d01250cd (diff) | |
| download | tor-a3c1d78c29a6827f623c83ca8f45798019206bc9.tar.gz tor-a3c1d78c29a6827f623c83ca8f45798019206bc9.zip | |
Merge branch 'maint-0.3.3'
| -rw-r--r-- | changes/bug25664 | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/HACKING/GettingStartedRust.md | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug25664 b/changes/bug25664 new file mode 100644 index 0000000000..c8b3ca6187 --- /dev/null +++ b/changes/bug25664 @@ -0,0 +1,3 @@ + o New system requirements: + - When built with Rust, Tor now depends on version 0.2.39 of the libc + crate. Closes tickets 25310 and 25664. diff --git a/configure.ac b/configure.ac index d7cc05c098..83760165ed 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,7 @@ fi AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version -rust_crates="libc-0.2.22" +rust_crates="libc-0.2.39" AC_SUBST(rust_crates) ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index f5914bc87a..a533ba8a27 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -65,7 +65,7 @@ fetching dependencies from Cargo or specifying a local directory. You'll need the following Rust dependencies (as of this writing): - libc==0.2.22 + libc==0.2.39 We vendor our Rust dependencies in a separate repo using [cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use |