nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson 2018-03-28 08:11:46 -04:00
commit a3c1d78c29
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug25664 Normal file
View File

@ -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.

2
configure.ac
View File

@ -281,7 +281,7 @@ fi
AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"])
dnl List all external rust crates we depend on here. Include the version 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) AC_SUBST(rust_crates)
ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [

2
doc/HACKING/GettingStartedRust.md
View File

@ -65,7 +65,7 @@ fetching dependencies from Cargo or specifying a local directory.
You'll need the following Rust dependencies (as of this writing): 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 We vendor our Rust dependencies in a separate repo using
[cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use [cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use