tor

commit a3c1d78c29a6827f623c83ca8f45798019206bc9
parent 6317aa2cc03a3b7a6f9fd4a4bdd99447f7914493
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 28 Mar 2018 08:11:46 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug25664
 | 
3
+++
M
configure.ac
 | 
2
+-
M
doc/HACKING/GettingStartedRust.md
 | 
2
+-

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/bug25664 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
@@ -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
@@ -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