diff --git a/ChangeLog b/ChangeLog
index 08e8025a6..4d249ced1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,53 @@
-Changes in version 0.2.9.7-rc - 2016-12-??
+Changes in version 0.2.9.7-rc - 2016-12-1?
+  Tor 0.2.9.7-rc fixes a few small bugs remaining in Tor 0.2.9.6-rc,
+  including a few that had prevented tests from passing on
+  some platforms.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the December 7 2016 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfix (build):
+    - The current Git revision when building from a local repository is
+      now detected correctly when using git worktrees. Fixes bug 20492;
+      bugfix on 0.2.3.9-alpha.
+
+  o Minor bugfixes (directory authority):
+    - When computing old Tor protocol line version in protover, we were
+      looking at 0.2.7.5 twice instead of a specific case for
+      0.2.9.1-alpha. Fixes bug 20810; bugfix on tor-0.2.9.4-alpha.
+
+  o Minor bugfixes (download scheduling):
+    - Resolve a "bug" warning when considering a download schedule whose
+      delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha.
+
+  o Minor bugfixes (logging):
+    - Downgrade a harmless log message about the
+      pending_entry_connections list from "warn" to "info". Mitigates
+      bug 19926.
+
+  o Minor bugfixes (memory leak):
+    - Fix a small memory leak when receiving AF_UNIX connections on a
+      SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha.
+    - When moving a signed descriptor object from a source to an
+      existing destination, free the allocated memory inside that
+      destination object. Fixes bug 20715; bugfix on tor-0.2.8.3-alpha.
+
+  o Minor bugfixes (memory leak, use-after-free, linux seccomp2 sandbox):
+    - Fix a memory leak and use-after-free error when removing entries
+      from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on
+      0.2.5.5-alpha. Patch from "cypherpunks".
+
+  o Minor bugfixes (unit tests):
+    - Stop expecting NetBSD unit tests to report success for ipfw. Part
+      of a fix for bug 19960; bugfix on 0.2.9.5-alpha.
+    - Fix tolerances in unit tests for monotonic time comparisons
+      between nanoseconds and microseconds. Previously, we accepted a 10
+      us difference only, which is not realistic on every platform's
+      clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha.
+    - Remove a double-free in the single onion service unit test. Stop
+      ignoring a return value. Make future changes less error-prone.
+      Fixes bug 20864; bugfix on 0.2.9.6-rc.
 
 
 Changes in version 0.2.8.11 - 2016-12-08
diff --git a/changes/19974 b/changes/19974
deleted file mode 100644
index 5496143dd..000000000
--- a/changes/19974
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (unit tests):
-    - Fix tolerances in unit tests for monotonic time comparisons between
-      nanoseconds and microseconds. Previously, we accepted a 10 us
-      difference only, which is not realistic on every platform's
-      clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha.
diff --git a/changes/20492 b/changes/20492
deleted file mode 100644
index fdcd4d0b4..000000000
--- a/changes/20492
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfix (build):
-    - The current Git revision when building from a local repository is now
-      detected correctly when using git worktrees.  Fixes bug 20492; bugfix on
-      0.2.3.9-alpha.
diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info
deleted file mode 100644
index 93fd81b6c..000000000
--- a/changes/bug19926_029_info
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (logging):
-    - Downgrade a harmless log message about the pending_entry_connections
-      list from "warn" to "info". Mitigates bug 19926.
diff --git a/changes/bug19960 b/changes/bug19960
deleted file mode 100644
index 5d655859a..000000000
--- a/changes/bug19960
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (netbsd, unit tests):
-    - Stop expecting NetBSD unit tests to report success for ipfw;
-      on NetBSD, it's only pf that's supported.
-      Part of a fix for bug 19960; bugfix on 0.2.9.5-alpha.
diff --git a/changes/bug20710_025 b/changes/bug20710_025
deleted file mode 100644
index 12bd07536..000000000
--- a/changes/bug20710_025
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (memory leak, use-after-free, linux seccomp2 sandbox):
-    - Fix a memory leak and use-after-free error when removing entries
-      from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on
-      0.2.5.5-alpha. Patch from "cypherpunks".
diff --git a/changes/bug20715 b/changes/bug20715
deleted file mode 100644
index 737a560ce..000000000
--- a/changes/bug20715
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (memory leak)
-    - When moving a signed descriptor object from a source to an existing
-      destination, free the allocated memory inside that destination object.
-      Bugfix on tor-0.2.8.3-alpha; Closes #20715.
diff --git a/changes/bug20716 b/changes/bug20716
deleted file mode 100644
index 37fd6feec..000000000
--- a/changes/bug20716
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (client, memory leak):
-    - Fix a small memory leak when receiving AF_UNIX connections on
-      a SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha.
diff --git a/changes/bug20810 b/changes/bug20810
deleted file mode 100644
index 5420a7317..000000000
--- a/changes/bug20810
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (relay)
-    - When computing old Tor protocol line version in protover, we were
-      looking at 0.2.7.5 twice instead of a specific case for 0.2.9.1-alpha.
-      Bugfix on tor-0.2.9.4-alpha.
diff --git a/changes/bug20864 b/changes/bug20864
deleted file mode 100644
index 7b8c70fad..000000000
--- a/changes/bug20864
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (unit tests, hidden services):
-    - Remove a double-free in the single onion service unit test. Stop
-      ignoring a return value. Make future changes less error-prone.
-      Fixes bug 20864; bugfix on 0.2.9.6-rc.
diff --git a/changes/bug20875 b/changes/bug20875
deleted file mode 100644
index 6bba2cbc1..000000000
--- a/changes/bug20875
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (download scheduling)
-    - Resolve a "bug" warning when considering a download schedule whose
-      delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha.
-
diff --git a/changes/geoip-december2016 b/changes/geoip-december2016
deleted file mode 100644
index 60754ea21..000000000
--- a/changes/geoip-december2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the December 7 2016 Maxmind GeoLite2
-      Country database.
-