start a changelog for 0.2.9.13

9 files changed, 49 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fc7eb5e9c..43e409d254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+Changes in version 0.2.9.13 - 2017-10-2?
+  Tor 0.2.9.13 backports a collection of bugfixes from later Tor release
+  series, including a bugfix for a crash issue that had affected relays
+  under memory pressure. 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 (relay, crash, assertion failure, backport from 0.3.2.2-alpha):
+    - Fix a timing-based assertion failure that could occur when the
+      circuit out-of-memory handler freed a connection's output buffer.
+      Fixes bug 23690; bugfix on 0.2.6.1-alpha.
+
+  o Minor features (directory authorities, backport from 0.3.2.2-alpha):
+    - Remove longclaw's IPv6 address, as it will soon change. Authority
+      IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves
+      3/8 directory authorities with IPv6 addresses, but there are also
+      52 fallback directory mirrors with IPv6 addresses. Resolves 19760.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (directory authority, backport from 0.3.1.5-alpha):
+    - When a directory authority rejects a descriptor or extrainfo with
+      a given digest, mark that digest as undownloadable, so that we do
+      not attempt to download it again over and over. We previously
+      tried to avoid downloading such descriptors by other means, but we
+      didn't notice if we accidentally downloaded one anyway. This
+      behavior became problematic in 0.2.7.2-alpha, when authorities
+      began pinning Ed25519 keys. Fixes bug 22349; bugfix
+      on 0.2.1.19-alpha.
+
+  o Minor bugfixes (memory safety, backport from 0.3.2.3-alpha):
+    - Clear the address when node_get_prim_orport() returns early.
+      Fixes bug 23874; bugfix on 0.2.8.2-alpha.
+
+  o Minor bugfixes (Windows service, backport from 0.3.1.6-rc):
+    - When running as a Windows service, set the ID of the main thread
+      correctly. Failure to do so made us fail to send log messages to
+      the controller in 0.2.1.16-rc, slowed down controller event
+      delivery in 0.2.7.3-rc and later, and crash with an assertion
+      failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha.
+      Patch and diagnosis from "Vort".
+
+
 Changes in version 0.2.9.12 - 2017-09-18
   Tor 0.2.9.12 backports a collection of bugfixes from later
   Tor series.
diff --git a/changes/bug22349 b/changes/bug22349
deleted file mode 100644
index bb43404bfe..0000000000
--- a/changes/bug22349
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes (directory authority):
-    - When a directory authority rejects a descriptor or extrainfo with
-      a given digest, mark that digest as undownloadable, so that we
-      do not attempt to download it again over and over. We previously
-      tried to avoid downloading such descriptors by other means, but
-      we didn't notice if we accidentally downloaded one anyway. This
-      behavior became problematic in 0.2.7.2-alpha, when authorities
-      began pinning Ed25519 keys. Fixes ticket
-      22349; bugfix on 0.2.1.19-alpha.
diff --git a/changes/bug23081 b/changes/bug23081
deleted file mode 100644
index 76c4e30971..0000000000
--- a/changes/bug23081
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (Windows service):
-    - When running as a Windows service, set the ID of the main thread
-      correctly. Failure to do so made us fail to send log messages
-      to the controller in 0.2.1.16-rc, slowed down controller
-      event delivery in 0.2.7.3-rc and later, and crash with an assertion
-      failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha.
-      Patch and diagnosis from "Vort".
-
diff --git a/changes/bug23690 b/changes/bug23690
deleted file mode 100644
index 36ff32e499..0000000000
--- a/changes/bug23690
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (relay, crash, assertion failure):
-    - Fix a timing-based assertion failure that could occur when the
-      circuit out-of-memory handler freed a connection's output buffer.
-      Fixes bug 23690; bugfix on 0.2.6.1-alpha.
-
diff --git a/changes/bug23874 b/changes/bug23874
deleted file mode 100644
index bf6620553d..0000000000
--- a/changes/bug23874
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory safety):
-    - Clear the address when node_get_prim_orport() returns early.
-      Fixes bug 23874; bugfix on 0.2.8.2-alpha.
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/longclaw-ipv6 b/changes/longclaw-ipv6
deleted file mode 100644
index 75899c9d07..0000000000
--- a/changes/longclaw-ipv6
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (directory authorities):
-    - Remove longclaw's IPv6 address, as it will soon change.
-      Authority IPv6 addresses were originally added in 0.2.8.1-alpha.
-      This leaves 3/8 directory authorities with IPv6 addresses, but there
-      are also 52 fallback directory mirrors with IPv6 addresses.
-      Resolves 19760.
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.