begin a changelog for 0.2.5.15

11 files changed, 41 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index d70ae21e53..5f3bad0086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Changes in version 0.2.5.15 - 2017-10-0?
+  Tor 0.2.5.15 backports a collection of bugfixes from later Tor release
+  series. It also adds a new directory authority, Bastet.
+
+  o Directory authority changes:
+    - Add "Bastet" as a ninth directory authority to the default list.
+      Closes ticket 23910.
+    - The directory authority "Longclaw" has changed its IP address.
+      Closes ticket 23592.
+
+  o Major bugfixes (openbsd, denial-of-service, backport from 0.3.1.5-alpha):
+    - Avoid an assertion failure bug affecting our implementation of
+      inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
+      handling of "0xx" differs from what we had expected. Fixes bug
+      22789; bugfix on 0.2.3.8-alpha. Also tracked as TROVE-2017-007.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (defensive programming, undefined behavior, backport from 0.3.1.4-alpha):
+    - Fix a memset() off the end of an array when packing cells. This
+      bug should be harmless in practice, since the corrupted bytes are
+      still in the same structure, and are always padding bytes,
+      ignored, or immediately overwritten, depending on compiler
+      behavior. Nevertheless, because the memset()'s purpose is to make
+      sure that any other cell-handling bugs can't expose bytes to the
+      network, we need to fix it. Fixes bug 22737; bugfix on
+      0.2.4.11-alpha. Fixes CID 1401591.
+
+  o Build features (backport from 0.3.1.5-alpha):
+    - Tor's repository now includes a Travis Continuous Integration (CI)
+      configuration file (.travis.yml). This is meant to help new
+      developers and contributors who fork Tor to a Github repository be
+      better able to test their changes, and understand what we expect
+      to pass. To use this new build feature, you must fork Tor to your
+      Github account, then go into the "Integrations" menu in the
+      repository settings for your fork and enable Travis, then push
+      your changes. Closes ticket 22636.
+
+
 Changes in version 0.2.5.14 - 2017-06-08
   Tor 0.2.5.14 backports a fix for a bug that would allow an attacker to
   remotely crash a hidden service with an assertion failure. Anyone
diff --git a/changes/bug22636 b/changes/bug22636
deleted file mode 100644
index 770cac72e9..0000000000
--- a/changes/bug22636
+++ /dev/null
@@ -1,8 +0,0 @@
- o Build features:
-   - Tor's repository now includes a Travis Continuous Integration (CI)
-     configuration file (.travis.yml). This is meant to help new developers and
-     contributors who fork Tor to a Github repository be better able to test
-     their changes, and understand what we expect to pass. To use this new build
-     feature, you must fork Tor to your Github account, then go into the
-     "Integrations" menu in the repository settings for your fork and enable
-     Travis, then push your changes.
diff --git a/changes/bug22737 b/changes/bug22737
deleted file mode 100644
index f0de8e6c41..0000000000
--- a/changes/bug22737
+++ /dev/null
@@ -1,12 +0,0 @@
-  o Minor bugfixes (defensive programming, undefined behavior):
-
-    - Fix a memset() off the end of an array when packing cells.  This
-      bug should be harmless in practice, since the corrupted bytes
-      are still in the same structure, and are always padding bytes,
-      ignored, or immediately overwritten, depending on compiler
-      behavior. Nevertheless, because the memset()'s purpose is to
-      make sure that any other cell-handling bugs can't expose bytes
-      to the network, we need to fix it. Fixes bug 22737; bugfix on
-      0.2.4.11-alpha. Fixes CID 1401591.
-
-
diff --git a/changes/bug22789 b/changes/bug22789
deleted file mode 100644
index a653592848..0000000000
--- a/changes/bug22789
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (openbsd, denial-of-service):
-    - Avoid an assertion failure bug affecting our implementation of
-      inet_pton(AF_INET6) on certain OpenBSD systems whose strtol()
-      handling of "0xfoo" differs from what we had expected.
-      Fixes bug 22789; bugfix on 0.2.3.8-alpha. Also tracked as
-      TROVE-2017-007.
-
diff --git a/changes/geoip-august2017 b/changes/geoip-august2017
deleted file mode 100644
index 2dab18a63f..0000000000
--- a/changes/geoip-august2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the August 3 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/geoip-july2017 b/changes/geoip-july2017
deleted file mode 100644
index ed10369f1b..0000000000
--- a/changes/geoip-july2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/geoip-june2017 b/changes/geoip-june2017
deleted file mode 100644
index 2ea7bf105e..0000000000
--- a/changes/geoip-june2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the June 8 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/geoip-october2017 b/changes/geoip-october2017
deleted file mode 100644
index 11f623e85f..0000000000
--- a/changes/geoip-october2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/geoip-september2017 b/changes/geoip-september2017
deleted file mode 100644
index be01ff9521..0000000000
--- a/changes/geoip-september2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/longclaw_23592 b/changes/longclaw_23592
deleted file mode 100644
index 91e2da8972..0000000000
--- a/changes/longclaw_23592
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-    - The directory authority "Longclaw" has changed its IP address.
-      Closes ticket 23592.
diff --git a/changes/ticket23910 b/changes/ticket23910
deleted file mode 100644
index eb38fcf32f..0000000000
--- a/changes/ticket23910
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-    - Add bastet as a ninth directory authority to the default list. Closes
-      ticket 23910.