Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2

diff --cc Makefile.am
index cb76edfa2f2d10694502f147891325b918ca943e,2c6de35743ad6e7dcb63283266e922aea32f4619..803e9d00df3e2db4bf8a8c3146d8f2d8a7e94c7e
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -31,9 -26,7 +31,7 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/
  endif
  
  if USE_RUST
- ## this MUST be $(), otherwise am__DEPENDENCIES will not track it
- rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) \
-       $(TOR_RUST_EXTRA_LIBS)
 -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@
++rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)
  else
  rust_ldadd=
  endif

diff --cc configure.ac
Simple merge