fold changes entries into changelog

4 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d666a654a..1f614b6661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Changes in version 0.2.3.19-rc - 2012-07-06
+   o Major bugfixes:
+     - Fix a bug handling SENDME cells on nonexistent streams that could
+       result in bizarre window values. Report and patch contributed
+       pseudonymously. Fixes part of bug 6271. This bug was introduced
+       before the first Tor release, in svn commit r152.
+
+   o Minor bugfixes:
+     - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes compilation
+       on Windows. Fixes bug 6296; bugfix on 0.2.3.18-rc.
+     - Fix wrong TCP port range in parse_port_range(). Fixes bug 6218;
+       bugfix on 0.2.1.10-alpha.
+
+
 Changes in version 0.2.3.18-rc - 2012-06-28
   Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.x
   series. It fixes a few smaller bugs, but generally appears stable.
diff --git a/changes/bug6218 b/changes/bug6218
deleted file mode 100644
index 5d5d108b00..0000000000
--- a/changes/bug6218
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Fix wrong TCP port range in parse_port_range(). Fixes bug 6218;
-      bugfix on 0.2.1.10-alpha.
diff --git a/changes/bug6271 b/changes/bug6271
deleted file mode 100644
index 06b129f73f..0000000000
--- a/changes/bug6271
+++ /dev/null
@@ -1,7 +0,0 @@
-   o Major bugfixes
-
-     - Fix a bug handling SENDME cells on nonexistent streams that
-       could result in bizarre window values. Report and patch
-       contributed pseudymously.  Fixes part of bug 6271. This bug
-       was introduced before the first Tor release, in svn commit
-       r152.
diff --git a/changes/bug6296 b/changes/bug6296
deleted file mode 100644
index b452b1745d..0000000000
--- a/changes/bug6296
+++ /dev/null
@@ -1,4 +0,0 @@
-   o Minor bugfixes:
-
-     - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes
-       compilation on Windows.  Fixes bug 6296; bugfix on 0.2.3.18-rc.