fold 17148 into changelog

diff --git a/ChangeLog b/ChangeLog
index a4f04a7ceb3ba3837eb12141cfdf9fd8264d2b9b..67de1b8a74a264c2e669708b1b49b8497a542cf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -254,6 +254,10 @@ Changes in version 0.2.7.3-rc - 2015-09-24
     - Autodetect CHUTNEY_PATH if the chutney and Tor sources are side-
       by-side in the same parent directory. Closes ticket 16903. Patch
       by "teor".
+    - Use environment variables rather than autoconf substitutions to
+      send variables from the build system to the test scripts. This
+      change should be easier to maintain, and cause 'make distcheck' to
+      work better than before. Fixes bug 17148.
     - Add a new set of callgraph analysis scripts that use clang to
       produce a list of which Tor functions are reachable from which
       other Tor functions. We're planning to use these to help simplify

diff --git a/changes/testscripts b/changes/testscripts
deleted file mode 100644 (file)
index d3ac79f..0000000
--- a/changes/testscripts
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Testing:
-   - Use environment variables rather than autoconf substitutions to send
-     variables from the build system to the test scripts. This change should
-     be easier to maintain, and cause 'make distcheck' to work better than
-     before. Fixes bug 17148.
-