[tor-commits] [tor/master] Merge branch 'add_rust_squashed'

[nickm at torproject.org]

commit 69ef94820b29500d93a8f2775764b8b96284bacb
Merge: 92d335b 70c0671
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 19 08:47:18 2017 -0400

    Merge branch 'add_rust_squashed'

 .gitignore                             |   5 ++
 .gitmodules                            |   3 +
 Makefile.am                            |  10 ++++
 configure.ac                           |  68 ++++++++++++++++++++++
 src/common/compat_rust.c               |  39 +++++++++++++
 src/common/compat_rust.h               |  28 +++++++++
 src/common/include.am                  |   6 ++
 src/ext/rust                           |   1 +
 src/include.am                         |   1 +
 src/or/include.am                      |   3 +-
 src/or/main.c                          |  10 ++++
 src/rust/.cargo/config.in              |   8 +++
 src/rust/.rustfmt.toml                 |   2 +
 src/rust/Cargo.lock                    |  14 +++++
 src/rust/Cargo.toml                    |   7 +++
 src/rust/include.am                    |   6 ++
 src/rust/tor_util/Cargo.toml           |  13 +++++
 src/rust/tor_util/ffi.rs               |  56 ++++++++++++++++++
 src/rust/tor_util/include.am           |  13 +++++
 src/rust/tor_util/lib.rs               |  13 +++++
 src/rust/tor_util/rust_string.rs       | 101 +++++++++++++++++++++++++++++++++
 src/rust/tor_util/tests/rust_string.rs |  37 ++++++++++++
 src/test/fuzz/include.am               |   3 +-
 src/test/include.am                    |  33 ++++++++---
 src/test/test.c                        |   1 +
 src/test/test.h                        |   1 +
 src/test/test_rust.c                   |  31 ++++++++++
 src/test/test_rust.sh                  |  13 +++++
 src/tools/include.am                   |  14 +++--
 29 files changed, 524 insertions(+), 16 deletions(-)

diff --cc src/common/include.am
index 51b7da6,b37b363..1253888
--- a/src/common/include.am
+++ b/src/common/include.am
@@@ -147,11 -151,11 +152,12 @@@ COMMONHEADERS = 
    src/common/compat.h				\
    src/common/compat_libevent.h			\
    src/common/compat_openssl.h			\
+   src/common/compat_rust.h			\
    src/common/compat_threads.h			\
    src/common/compat_time.h			\
 -  src/common/compress.h			\
 +  src/common/compress.h				\
    src/common/compress_lzma.h			\
 +  src/common/compress_none.h			\
    src/common/compress_zlib.h			\
    src/common/compress_zstd.h			\
    src/common/confline.h				\