commit f5e9e2748ff5fa245936ce5e465d19b3d300e393 Merge: c4804bb28 91a1b9058 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 27 10:05:30 2017 -0400

Merge branch 'protover-rust-impl_squashed'

Makefile.am | 2 +- changes/ticket22840 | 8 + configure.ac | 6 +- src/common/compat_rust.c | 39 -- src/common/compat_rust.h | 28 -- src/common/include.am | 6 - src/or/include.am | 1 + src/or/main.c | 18 +- src/or/protover.c | 4 + src/or/protover.h | 6 +- src/or/protover_rust.c | 19 + src/rust/Cargo.lock | 41 ++ src/rust/Cargo.toml | 2 +- src/rust/external/Cargo.toml | 13 + src/rust/external/external.rs | 33 ++ src/rust/external/lib.rs | 14 + src/rust/include.am | 2 +- src/rust/protover/Cargo.toml | 25 + src/rust/protover/ffi.rs | 185 +++++++ src/rust/protover/lib.rs | 33 ++ src/rust/protover/protover.rs | 851 +++++++++++++++++++++++++++++++++ src/rust/protover/tests/protover.rs | 291 +++++++++++ src/rust/smartlist/Cargo.toml | 13 + src/rust/smartlist/lib.rs | 8 + src/rust/smartlist/smartlist.rs | 115 +++++ src/rust/tor_allocate/Cargo.toml | 13 + src/rust/tor_allocate/lib.rs | 15 + src/rust/tor_allocate/tor_allocate.rs | 101 ++++ src/rust/tor_rust/Cargo.toml | 16 + src/rust/tor_rust/include.am | 12 + src/rust/tor_rust/lib.rs | 5 + src/rust/tor_util/Cargo.toml | 5 +- src/rust/tor_util/ffi.rs | 62 +-- src/rust/tor_util/include.am | 13 - src/rust/tor_util/lib.rs | 14 +- src/rust/tor_util/rust_string.rs | 101 ---- src/rust/tor_util/tests/rust_string.rs | 37 -- src/test/include.am | 1 - src/test/test.c | 1 - src/test/test.h | 1 - src/test/test_protover.c | 43 +- src/test/test_rust.c | 31 -- src/test/test_rust.sh | 5 +- 43 files changed, 1908 insertions(+), 331 deletions(-)