summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-09 19:52:10 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-09 19:52:10 -0400
commit0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70 (patch)
tree4e7891f27a0eff78450d100e64e8bd14da7a1b1d
parentff1f6c417c53d905f47f26ea6b0fa90888857a8c (diff)
downloadtor-0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70.tar.gz
tor-0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70.zip
Fold more into the 0.2.6.4-rc changelogtor-0.2.6.4-rc
-rw-r--r--ChangeLog10
-rw-r--r--changes/bug152055
-rw-r--r--changes/geoip-march20153
-rw-r--r--changes/geoip6-march20153
4 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index e77a0c4afc..def84f9941 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 0cb9f3f4bc..0000000000
--- 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 565781280a..0000000000
--- 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 9a38c65e62..0000000000
--- a/changes/geoip6-march2015
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database.
-