Fold changes entries into releasenotes and changelog

8 files changed, 73 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index 20a00899c7..9a25202562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+Changes in version 0.4.0.5 - 2019-0?-??
+  Blurb
+
+  o Minor features (continuous integration):
+    - In Travis, tell timelimit to use stem's backtrace signals, and
+      launch python directly from timelimit, so python receives the
+      signals from timelimit, rather than make. Closes ticket 30117.
+
+  o Minor features (diagnostic):
+    - Add more diagnostic log messages in an attempt to solve the issue
+      of NUL bytes appearing in a microdescriptor cache. Related to
+      ticket 28223.
+
+  o Minor features (testing):
+    - Use the approx_time() function when setting the "Expires" header
+      in directory replies, to make them more testable. Needed for
+      ticket 30001.
+
+  o Minor bugfixes (rust):
+    - Abort on panic in all build profiles, instead of potentially
+      unwinding into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (shellcheck):
+    - Look for scripts in their correct locations during "make
+      shellcheck". Previously we had looked in the wrong place during
+      out-of-tree builds. Fixes bug 30263; bugfix on 0.4.0.1-alpha.
+
+  o Minor bugfixes (testing):
+    - Check the time in the "Expires" header using approx_time(). Fixes
+      bug 30001; bugfix on 0.4.0.4-rc.
+
+
 Changes in version 0.4.0.4-rc - 2019-04-11
   Tor 0.4.0.4-rc is the first release candidate in its series; it fixes
   several bugs from earlier versions, including some that had affected
diff --git a/ReleaseNotes b/ReleaseNotes
index 9f7d6d33ed..df4f969dfc 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-Changes in version 0.4.0.x - 2019-0?-??
+Changes in version 0.4.0.5 - 2019-0?-??
   Blurb
 
   o Major features (battery management, client, dormant mode):
@@ -116,6 +116,9 @@ Changes in version 0.4.0.x - 2019-0?-??
       issue 29962.
     - Log Python version during each Travis CI job. Resolves
       issue 28551.
+    - In Travis, tell timelimit to use stem's backtrace signals, and
+      launch python directly from timelimit, so python receives the
+      signals from timelimit, rather than make. Closes ticket 30117.
 
   o Minor features (controller):
     - Add a DROPOWNERSHIP command to undo the effects of TAKEOWNERSHIP.
@@ -133,6 +136,11 @@ Changes in version 0.4.0.x - 2019-0?-??
       commits from ending up in the master branch, as scripts/main/pre-
       push.git-hook. Closes ticket 27993.
 
+  o Minor features (diagnostic):
+    - Add more diagnostic log messages in an attempt to solve the issue
+      of NUL bytes appearing in a microdescriptor cache. Related to
+      ticket 28223.
+
   o Minor features (directory authority):
     - When a directory authority is using a bandwidth file to obtain
       bandwidth values, include the digest of that file in the vote.
@@ -259,6 +267,9 @@ Changes in version 0.4.0.x - 2019-0?-??
       ticket 28668.
     - Allow a HeartbeatPeriod of less than 30 minutes in testing Tor
       networks. Closes ticket 28840. Patch by Rob Jansen.
+    - Use the approx_time() function when setting the "Expires" header
+      in directory replies, to make them more testable. Needed for
+      ticket 30001.
 
   o Minor bugfixes (security):
     - Fix a potential double free bug when reading huge bandwidth files.
@@ -421,6 +432,10 @@ Changes in version 0.4.0.x - 2019-0?-??
       avoid deadlocking when a pipe's buffer is full. Fixes bug 26360;
       bugfix on 0.2.3.6-alpha.
 
+  o Minor bugfixes (rust):
+    - Abort on panic in all build profiles, instead of potentially
+      unwinding into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha.
+
   o Minor bugfixes (scheduler):
     - When re-adding channels to the pending list, check the correct
       channel's sched_heap_idx. This issue has had no effect in mainline
@@ -428,6 +443,11 @@ Changes in version 0.4.0.x - 2019-0?-??
       of our circuit scheduling code. Fixes bug 29508; bugfix
       on 0.3.2.10.
 
+  o Minor bugfixes (shellcheck):
+    - Look for scripts in their correct locations during "make
+      shellcheck". Previously we had looked in the wrong place during
+      out-of-tree builds. Fixes bug 30263; bugfix on 0.4.0.1-alpha.
+
   o Minor bugfixes (single onion services):
     - Allow connections to single onion services to remain idle without
       being disconnected. Previously, relays acting as rendezvous points
@@ -472,6 +492,8 @@ Changes in version 0.4.0.x - 2019-0?-??
       objects in test_build_descriptors(), we now deallocate them one by
       one. This lets Coverity know that we are not leaking memory there
       and fixes CID 1442277. Fixes bug 28989; bugfix on 0.3.5.1-alpha.
+    - Check the time in the "Expires" header using approx_time(). Fixes
+      bug 30001; bugfix on 0.4.0.4-rc.
 
   o Minor bugfixes (TLS protocol):
     - When classifying a client's selection of TLS ciphers, if the
@@ -514,23 +536,6 @@ Changes in version 0.4.0.x - 2019-0?-??
       dependency graph over the directories that they cover. Our
       checkIncludes.py tool now enforces this noncircularity. Closes
       ticket 28362.
-  o Code simplification and refactoring (onion service v3):
-    - Consolidate the authorized client descriptor cookie computation
-      code from client and service into one function. Closes
-      ticket 27549.
-
-  o Code simplification and refactoring (shell scripts):
-    - Cleanup scan-build.sh to silence shellcheck warnings. Closes
-      ticket 28007.
-    - Fix issues that shellcheck found in chutney-git-bisect.sh.
-      Resolves ticket 28006.
-    - Fix issues that shellcheck found in updateRustDependencies.sh.
-      Resolves ticket 28012.
-    - Fix shellcheck warnings in cov-diff script. Resolves issue 28009.
-    - Fix shellcheck warnings in run_calltool.sh. Resolves ticket 28011.
-    - Fix shellcheck warnings in run_trunnel.sh. Resolves issue 28010.
-    - Fix shellcheck warnings in scripts/test/coverage. Resolves
-      issue 28008.
 
   o Documentation:
     - Clarify that Tor performs stream isolation among *Port listeners
@@ -561,6 +566,24 @@ Changes in version 0.4.0.x - 2019-0?-??
     - Add unit tests for tokenize_string() and get_next_token()
       functions. Resolves ticket 27625.
 
+  o Code simplification and refactoring (onion service v3):
+    - Consolidate the authorized client descriptor cookie computation
+      code from client and service into one function. Closes
+      ticket 27549.
+
+  o Code simplification and refactoring (shell scripts):
+    - Cleanup scan-build.sh to silence shellcheck warnings. Closes
+      ticket 28007.
+    - Fix issues that shellcheck found in chutney-git-bisect.sh.
+      Resolves ticket 28006.
+    - Fix issues that shellcheck found in updateRustDependencies.sh.
+      Resolves ticket 28012.
+    - Fix shellcheck warnings in cov-diff script. Resolves issue 28009.
+    - Fix shellcheck warnings in run_calltool.sh. Resolves ticket 28011.
+    - Fix shellcheck warnings in run_trunnel.sh. Resolves issue 28010.
+    - Fix shellcheck warnings in scripts/test/coverage. Resolves
+      issue 28008.
+
 
 Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor.
diff --git a/changes/.dummy b/changes/.dummy
deleted file mode 100644
index dd9738feb2..0000000000
--- a/changes/.dummy
+++ /dev/null
@@ -1,37 +0,0 @@
-This file is here to keep git from removing the changes directory when
-all the changes files have been merged.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-"I'm Nobody! Who are you?
- Are you--Nobody--too?
- Then there's a pair of us!
- Don’t tell! they'd advertise--you know!
-
- How dreary--to be--Somebody!
- How public--like a Frog--
- To tell one's name--the livelong June--
- To an admiring Bog!"
-    -- Emily Dickinson
-
diff --git a/changes/bug27199 b/changes/bug27199
deleted file mode 100644
index f9d2a422f9..0000000000
--- a/changes/bug27199
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (rust):
-    - Abort on panic in all build profiles, instead of potentially unwinding
-      into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha.
diff --git a/changes/bug30001 b/changes/bug30001
deleted file mode 100644
index 52e58872ef..0000000000
--- a/changes/bug30001
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features (testing):
-    - Use the approx_time() function when setting the "Expires" header
-      in directory replies, to make them more testable. Needed for
-      ticket 30001.
-  o Minor bug fixes (testing):
-    - Check the time in the "Expires" header with approx_time().
-      Fixes bug 30001; bugfix on 0.4.0.4-rc.
diff --git a/changes/bug30263 b/changes/bug30263
deleted file mode 100644
index ba81c1b8a1..0000000000
--- a/changes/bug30263
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (shellcheck):
-    - Stop looking for scripts in the build directory during
-      "make shellcheck". Fixes bug 30263; bugfix on 0.4.0.1-alpha.
diff --git a/changes/diagnostic_28223_redux b/changes/diagnostic_28223_redux
deleted file mode 100644
index 0d7499832e..0000000000
--- a/changes/diagnostic_28223_redux
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (diagnostic):
-    - Add more diagnostic log messages in an attempt to solve
-      the issue of NUL bytes appearing in a microdescriptor cache.
-      Related to ticket 28223.
diff --git a/changes/ticket30117 b/changes/ticket30117
deleted file mode 100644
index 5b6e6dabf7..0000000000
--- a/changes/ticket30117
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Testing (continuous integration):
-    - In Travis, tell timelimit to use stem's backtrace signals. And launch
-      python directly from timelimit, so python receives the signals from
-      timelimit, rather than make. Closes ticket 30117.