Merge branch 'maint-0.2.7'

This commit is contained in:
Nick Mathewson 2015-12-14 15:45:54 -05:00
commit 9a179ff751

View File

@ -1,4 +1,7 @@
AM_TESTS_ENVIRONMENT = \ # When the day comes that Tor requires Automake >= 1.12 change
# TESTS_ENVIRONMENT to AM_TESTS_ENVIRONMENT because the former is reserved for
# users while the later is reserved for developers.
TESTS_ENVIRONMENT = \
export PYTHON="$(PYTHON)"; \ export PYTHON="$(PYTHON)"; \
export SHELL="$(SHELL)"; \ export SHELL="$(SHELL)"; \
export abs_top_srcdir="$(abs_top_srcdir)"; \ export abs_top_srcdir="$(abs_top_srcdir)"; \