commit f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b Merge: 58f54a358 2edc9cd48 Author: Taylor Yu catalyst@torproject.org Date: Thu Apr 26 16:07:56 2018 -0500

Merge branch 'bug25936-032' into bug25936-033

.travis.yml | 4 +++- Makefile.am | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc Makefile.am index 04ca88a23,4d2d9d222..08cb8e3e7 --- a/Makefile.am +++ b/Makefile.am @@@ -250,7 -248,11 +250,15 @@@ clean-local rm -rf $(top_builddir)/src/rust/target rm -rf $(top_builddir)/src/rust/.cargo/registry

+if USE_RUST +distclean-local: distclean-rust +endif + + # This relies on some internal details of how automake implements + # distcheck. We check two directories because automake-1.15 changed + # from $(distdir)/_build to $(distdir)/_build/sub. + show-distdir-testlog: + @if test -d "$(distdir)/_build/sub"; then \ + cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \ + else \ + cat $(distdir)/_build/$(TEST_SUITE_LOG); fi