Fold new entries into 0.2.5.7 changelog

6 files changed, 20 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 2800351c91..d729e382e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,28 @@
-Changes in version 0.2.5.7-beta - 2014-08-??
+Changes in version 0.2.5.7-beta - 2014-09-??
   o Major bugfixes (client, startup):
     - When Tor starts with DisabledNetwork set, it would correctly
       conclude that it shouldn't try making circuits, but it would
       mistakenly cache this conclusion and continue believing it even
       when DisableNetwork is set to 0. Fixes the bug introduced by the
       fix for bug 11200; bugfix on 0.2.5.4-alpha.
+    - Resume expanding abbreviations for command-line options. The fix
+      for bug 4647 accidentally removed our hack from bug 586 that rewrote
+      HashedControlPassword to __HashedControlSessionPassword when it
+      appears on the commandline (which allowed the user to set her
+      own HashedControlPassword in the torrc file while the controller
+      generates a fresh session password for each run). Fixes bug 12948;
+      bugfix on 0.2.5.1-alpha.
 
   o Major bugfixes (relay):
     - Avoid queuing or sending destroy cells for circuit ID zero when we
       fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1.
       Found and fixed by "cypherpunks".
+    - Downgrade "Unexpected onionskin length after decryption" warning
+      to a protocol-warn, since there's nothing relay operators can do
+      about a client that sends them a malformed create cell. Resolves
+      bug 12996; bugfix on 0.0.6rc1.
+    - Log more specific warnings when we get an ESTABLISH_RENDEZVOUS cell
+      on a cannibalized or non-OR circuit. Resolves ticket 12997.
 
   o Minor features (bridge):
     - Add an ExtORPortCookieAuthFileGroupReadable option to make the
@@ -28,6 +41,10 @@ Changes in version 0.2.5.7-beta - 2014-08-??
       Fixes bug 12693; bugfix on 0.2.5.2-alpha.
     - Fix compilation of test.h with MSVC. Patch from Gisle Vanem;
       bugfix on 0.2.5.5-alpha.
+    - Fix a large number of false positive warnings from the clang
+      analyzer static analysis tool. This should make real warnings
+      easier for clang analyzer to find. Patch from "teor". Closes
+      ticket 13036.
 
   o Distribution (systemd):
     - Verify configuration file via ExecStartPre in the systemd unit
@@ -45,6 +62,8 @@ Changes in version 0.2.5.7-beta - 2014-08-??
     - Adjust the URLs in the README to refer to the new locations of
       several documents on the website. Patch from Matt Pagan. Fixes
       bug 12830.
+    - Document 'reject6' and 'accept6' ExitPolicy entries. Resolves
+      ticket 12878.
 
 
 Changes in version 0.2.5.6-alpha - 2014-07-28
diff --git a/changes/bug12878 b/changes/bug12878
deleted file mode 100644
index a05fc446b9..0000000000
--- a/changes/bug12878
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Document 'reject6' and 'accept6' ExitPolicy entries. Resolves 
-      ticket 12878.
diff --git a/changes/bug12948 b/changes/bug12948
deleted file mode 100644
index 431c0a1019..0000000000
--- a/changes/bug12948
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes:
-    - Resume expanding abbreviations for command-line options. The fix
-      for bug 4647 accidentally removed our hack from bug 586 that rewrote
-      HashedControlPassword to __HashedControlSessionPassword when it
-      appears on the commandline (which allowed the user to set her
-      own HashedControlPassword in the torrc file while the controller
-      generates a fresh session password for each run). Fixes bug 12948;
-      bugfix on 0.2.5.1-alpha.
diff --git a/changes/bug12996 b/changes/bug12996
deleted file mode 100644
index 4b4fb0dceb..0000000000
--- a/changes/bug12996
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Downgrade "Unexpected onionskin length after decryption" warning
-      to a protocol-warn, since there's nothing relay operators can do
-      about a client that sends them a malformed create cell. Resolves
-      bug 12996; bugfix on 0.0.6rc1.
diff --git a/changes/bug12997 b/changes/bug12997
deleted file mode 100644
index fb6e7a8459..0000000000
--- a/changes/bug12997
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Log more specific warnings when we get an ESTABLISH_RENDEZVOUS cell
-      on a cannibalized or non-OR circuit. Resolves ticket 12997.
diff --git a/changes/ticket13036 b/changes/ticket13036
deleted file mode 100644
index 1b4784358a..0000000000
--- a/changes/ticket13036
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix a large number of false positive warnings from the clang
-      analyzer static analysis tool. This should make real warnings
-      easier for clang analyzer to find. Patch from "teor". Closes
-      ticket 13036.