diff --git a/ChangeLog b/ChangeLog
index 9331df79c..5fe4b5d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Changes in version 0.2.9.9 - 2017-01-23
+  Blurb here
+
+  o Major bugfixes (client, onion service):
+    - Fix a client-side onion service reachability bug, where multiple
+      socks requests to an onion service (or a single slow request)
+      could cause us to mistakenly mark some of the service's
+      introduction points as failed, and we cache that failure so
+      eventually we run out and can't reach the service. Also resolves a
+      mysterious "Remote server sent bogus reason code 65021" log
+      warning. The bug was introduced in ticket 17218, where we tried to
+      remember the circuit end reason as a uint16_t, which mangled
+      negative values. Partially fixes bug 21056 and fixes bug 20307;
+      bugfix on 0.2.8.1-alpha.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (portability):
+    - Avoid crashing when Tor is built using headers that contain
+      CLOCK_MONOTONIC_COARSE, but then tries to run on an older kernel
+      without CLOCK_MONOTONIC_COARSE. Fixes bug 21035; bugfix
+      on 0.2.9.1-alpha.
+    - Fix Libevent detection on platforms without Libevent 1 headers
+      installed. Fixes bug 21051; bugfix on 0.2.9.1-alpha.
+
+
 Changes in version 0.2.9.8 - 2016-12-19
 
   Tor 0.2.9.8 is the first stable release of the Tor 0.2.9 series.
diff --git a/changes/bug20307 b/changes/bug20307
deleted file mode 100644
index 9112c9c78..000000000
--- a/changes/bug20307
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (circuit, hidden service)
-    - When closing a circuit, the reason for doing so was assigned from an int
-      value to a uint16_t which is quite a problem for negative values that are
-      our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS
-      side, this was causing introduction points to be flagged as unusable
-      because the reason wasn't the right one due to the bad conversion.
-      Partially fixes bug 21056 and fixes bug 20307; Bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug21035 b/changes/bug21035
deleted file mode 100644
index bbf334078..000000000
--- a/changes/bug21035
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (portability):
-    - Avoid crashing when Tor is built using headers that contain
-      CLOCK_MONOTONIC_COARSE, but then tries to run on an older kernel
-      without CLOCK_MONOTONIC_COARSE. Fixes bug 21035; bugfix on
-      0.2.9.1-alpha.
-
diff --git a/changes/bug21051 b/changes/bug21051
deleted file mode 100644
index 8bb4f80c8..000000000
--- a/changes/bug21051
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Fix Libevent detection on platforms without Libevent 1 headers
-      installed. Fixes bug 21051; bugfix on 0.2.9.1-alpha.
diff --git a/changes/geoip-january2017 b/changes/geoip-january2017
deleted file mode 100644
index 77bc9a599..000000000
--- a/changes/geoip-january2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2
-      Country database.
-