Copy 0.2.8.8 changelog entries forward

1 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f422fd83df..6cdd92bcdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,19 @@ Changes in version 0.2.9.3-alpha - 2016-09-2?
   resolves several bugs -- including a pair of crash bugs from the 0.2.8
   series. Anybody running an earlier version of 0.2.9.x should upgrade.
 
-  XXXXX Add items from the 0.2.8.8 changelog.
+  o Major bugfixes (crash, also in 0.2.8.8):
+    - Fix a complicated crash bug that could affect Tor clients
+      configured to use bridges when replacing a networkstatus consensus
+      in which one of their bridges was mentioned. OpenBSD users saw
+      more crashes here, but all platforms were potentially affected.
+      Fixes bug 20103; bugfix on 0.2.8.2-alpha.
+
+  o Major bugfixes (relay, OOM handler, also in 0.2.8.8):
+    - Fix a timing-dependent assertion failure that could occur when we
+      tried to flush from a circuit after having freed its cells because
+      of an out-of-memory condition. Fixes bug 20203; bugfix on
+      0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing
+      this one.
 
   o Major features (circuit building, security):
     - Authorities, relays and clients specifically check that each
@@ -64,6 +76,10 @@ Changes in version 0.2.9.3-alpha - 2016-09-2?
       We believe that no such clients currently exist, since we have
       required OpenSSL 0.9.7 or later since 2009. Closes ticket 19998.
 
+  o Minor features (geoip, also in 0.2.8.8):
+    - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
+      Country database.
+
   o Minor feature (port flags):
     - Add *Port flags NoDNSRequest and NoOnionTraffic, and the synthetic
       flag OnionTrafficOnly, which is equivalent to NoDNSRequest,