[tor-commits] [tor/release-0.2.6] Fold more into the 0.2.6.4-rc changelog

[nickm@xxxxxxxxxxxxxx]

commit 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 9 19:52:10 2015 -0400

    Fold more into the 0.2.6.4-rc changelog
---
 ChangeLog                |   10 ++++++++++
 changes/bug15205         |    5 -----
 changes/geoip-march2015  |    3 ---
 changes/geoip6-march2015 |    3 ---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e77a0c4..def84f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Changes in version 0.2.6.4-rc - 2015-03-09
   directories. It also resolves some minor issues left over from, or
   introduced in, Tor 0.2.6.3-alpha or earlier.
 
+  o Major bugfixes (crash, OSX, security):
+    - Fix a remote denial-of-service opportunity caused by a bug in
+      OSX's _strlcat_chk() function. Fixes bug 15205; bug first appeared
+      in OSX 10.9.
+
   o Major bugfixes (relay, stability, possible security):
     - Fix a bug that could lead to a relay crashing with an assertion
       failure if a buffer of exactly the wrong layout is passed to
@@ -33,6 +38,11 @@ Changes in version 0.2.6.4-rc - 2015-03-09
       information about the server we were trying to connect to when we
       noticed the problem. Closes ticket 15006.
 
+  o Minor features (geoip):
+    - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database.
+    - Update geoip6 to the March 3 2015 Maxmind GeoLite2
+      Country database.
+
   o Minor features (logs):
     - Quiet some log messages in the heartbeat and at startup. Closes
       ticket 14950.
diff --git a/changes/bug15205 b/changes/bug15205
deleted file mode 100644
index 0cb9f3f..0000000
--- a/changes/bug15205
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (crash, OSX, security):
-    - Fix a remote denial-of-service opportunity caused by a bug
-      in OSX's _strlcat_chk() function. Fixes bug 15205; bug first
-      appeared in OSX 10.9. 
-      
diff --git a/changes/geoip-march2015 b/changes/geoip-march2015
deleted file mode 100644
index 5657812..0000000
--- a/changes/geoip-march2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015
deleted file mode 100644
index 9a38c65..0000000
--- a/changes/geoip6-march2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database.
-

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits