Merge branch 'maint-0.3.2'

diff --cc Makefile.am
index 2c6de35743ad6e7dcb63283266e922aea32f4619,a126986f3a2599e811c972541c0a9410c4e993a8..04ca88a2369be8e42da5b2c49f918730b3b076a1
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -26,7 -26,8 +26,8 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/
  endif
  
  if USE_RUST
- rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@
 -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \
++rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \
+       @TOR_RUST_EXTRA_LIBS@
  else
  rust_ldadd=
  endif

diff --cc configure.ac
index e471f8f9144f13ad91ea79593f73fe0b78b7d9c3,0fdb84c1317b4f600369c3b6df1b7115f0a1b22f..9bb09b2dfa85afe6c9750ffa6a38a61aabedb282
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -479,9 -467,10 +488,11 @@@ if test "x$enable_rust" = "xyes"; the
    if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then
      AC_MSG_ERROR([rustc must be at least version 1.14])
    fi
 +  AC_MSG_RESULT([$RUSTC_VERSION])
  fi
  
+ AC_SUBST(TOR_RUST_EXTRA_LIBS)
+ 
  AC_SEARCH_LIBS(socket, [socket network])
  AC_SEARCH_LIBS(gethostbyname, [nsl])
  AC_SEARCH_LIBS(dlopen, [dl])