Merge branch 'maint-0.3.3'

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test_rust.sh
index 0268668b3d365fb5566aed3db43de82dc6e3dc71,d87336e700a8bfbb2d26424833df27312dd7197b..c35c57456f138e079715b5d83c11985daeb3571a
--- 1/src/test/test_rust.sh
--- 2/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@@ -1,20 -1,15 +1,14 @@@
  #!/bin/sh
  # Test all Rust crates
  
- crates="protover tor_util smartlist tor_allocate"
- 
- exitcode=0
- 
  set -e
  
- for crate in $crates; do
-     cd "${abs_top_builddir:-../../..}/src/rust"
-     CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
-       CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
-       "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
-       --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \
-       || exitcode=1
-     cd -
- done
+ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
+     CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
+     find "${abs_top_srcdir:-../../..}/src/rust" \
+     -mindepth 2 -maxdepth 2 \
+     -type f -name 'Cargo.toml' \
+     -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
+     --manifest-path '{}' \;
  
- exit $exitcode
+ exit $?
 -