[tor-commits] [tor/release-0.2.6] Start 0.2.6.6 changelog; fold in the one entry.

[nickm at torproject.org]

commit 6ce1a821323f4a51b5622e64b55bf4837d348d53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 24 09:37:36 2015 -0400

    Start 0.2.6.6 changelog; fold in the one entry.
---
 ChangeLog        |   18 ++++++++++++++++++
 ReleaseNotes     |   18 ++++++++++--------
 changes/bug15436 |    4 ----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de97d6c..27e1616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes in version 0.2.6.6 - 2015-0?-??
+  Tor 0.2.6.6 is the first stable release in the 0.2.6 series.
+
+  It adds numerous safety, security, correctness, and performance
+  improvements. Client programs can be configured to use more kinds of
+  sockets, AutomapHosts works better, the multithreading backend is
+  improved, cell transmission is refactored, test coverage is much
+  higher, more denial-of-service attacks are handled, guard selection is
+  improved to handle long-term guards better, pluggable transports
+  should work a bit better, and some annoying hidden service performance
+  bugs should be addressed.
+
+  o Minor bugfixes (portability):
+    - Use the correct datatype in the SipHash-2-4 function to prevent
+      compilers from assuming any sort of alignment. Fixes bug 15436;
+      bugfix on 0.2.5.3-alpha.
+
+
 Changes in version 0.2.6.5-rc - 2015-03-18
   Tor 0.2.6.5-rc is the second and (hopefully) last release candidate in
   the 0.2.6. It fixes a small number of bugs found in 0.2.6.4-rc.
diff --git a/ReleaseNotes b/ReleaseNotes
index 403303e..1a3fb01 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -5,17 +5,16 @@ each development snapshot, see the ChangeLog file.
 
 
 Changes in version 0.2.6.6 - 2015-0?-??
-
   Tor 0.2.6.6 is the first stable release in the 0.2.6 series.
 
   It adds numerous safety, security, correctness, and performance
-  improvements. Client programs can be configured to use more kinds
-  of sockets, AutomapHosts works better, the multithreading backend
-  is improved, cell transmission is refactored, test coverage is
-  much higher, more denial-of-service attacks are handled, guard
-  selection is improved to handle long-term guards better, pluggable
-  transports should work a bit better, and some annoying hidden
-  service performance bugs should be addressed.
+  improvements. Client programs can be configured to use more kinds of
+  sockets, AutomapHosts works better, the multithreading backend is
+  improved, cell transmission is refactored, test coverage is much
+  higher, more denial-of-service attacks are handled, guard selection is
+  improved to handle long-term guards better, pluggable transports
+  should work a bit better, and some annoying hidden service performance
+  bugs should be addressed.
 
   o New compiler and system requirements:
     - Tor 0.2.6.x requires that your compiler support more of the C99
@@ -676,6 +675,9 @@ Changes in version 0.2.6.6 - 2015-0?-??
     - Fix the ioctl()-based network interface lookup code so that it
       will work on systems that have variable-length struct ifreq, for
       example Mac OS X.
+    - Use the correct datatype in the SipHash-2-4 function to prevent
+      compilers from assuming any sort of alignment. Fixes bug 15436;
+      bugfix on 0.2.5.3-alpha.
 
   o Minor bugfixes (preventative security, C safety):
     - When reading a hexadecimal, base-32, or base-64 encoded value from
diff --git a/changes/bug15436 b/changes/bug15436
deleted file mode 100644
index 4fa44d1..0000000
--- a/changes/bug15436
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (portability):
-    - Use the correct datatype in the SipHash-2-4 function to prevent compilers
-      from assuming any sort of alignment.  Fixes bug 15436; bugfix on
-      0.2.5.3-alpha.