diff --git a/ChangeLog b/ChangeLog
index 9af97c8c0..d5eab7cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Changes in version 0.2.6.8 - 2015-05-2?
+  Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and
+  fixes an authority-side bug in assigning the HSDir flag. All directory
+  authorities should upgrade.
+
+  o Major bugfixes (hidden services):
+    - Revert commit that made directory authorities assign the HSDir
+      flag to relay without a DirPort; this was bad because such relays
+      can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix
+      on tor-0.2.6.3-alpha.
+
+  o Minor bugfixes (hidden service):
+    - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on
+      a client authorized hidden service. Fixes bug 15823; bugfix
+      on 0.2.1.6-alpha.
+
+  o Minor features (geoip):
+    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
+    - Update geoip6 to the April 8 2015 Maxmind GeoLite2
+      Country database.
+
 Changes in version 0.2.6.7 - 2015-04-06
   Tor 0.2.6.7 fixes two security issues that could be used by an
   attacker to crash hidden services, or crash clients visiting hidden
diff --git a/changes/bug15823 b/changes/bug15823
deleted file mode 100644
index 987de5d9a..000000000
--- a/changes/bug15823
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden service):
-    - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells
-      on a client authorized hidden service. Fixes bug 15823; bugfix
-      on 0.2.1.6-alpha.
diff --git a/changes/bug15850 b/changes/bug15850
deleted file mode 100644
index 48a7c7bdd..000000000
--- a/changes/bug15850
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfix
-    - Revert commit that made directory authority assign the HSDir flag to
-      relay without a DirPort which is bad because relay can't handle
-      BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha;
diff --git a/changes/geoip-april2015 b/changes/geoip-april2015
deleted file mode 100644
index 7db38ed79..000000000
--- a/changes/geoip-april2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/geoip6-april2015 b/changes/geoip6-april2015
deleted file mode 100644
index 241c9119b..000000000
--- a/changes/geoip6-april2015
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features:
-    - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.