From 299f892815bff3aea4b1b2c3bd6b925d94c37a08 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Jun 2016 13:42:48 -0400
Subject: [PATCH] One more changelog entry.

---
 ChangeLog             | 4 ++++
 changes/bug19191      | 5 -----
 changes/bug19203      | 4 ----
 changes/bug19213      | 3 ---
 changes/bug19406      | 4 ----
 changes/geoip-jun2016 | 4 ----
 6 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 changes/bug19191
 delete mode 100644 changes/bug19203
 delete mode 100644 changes/bug19213
 delete mode 100644 changes/bug19406
 delete mode 100644 changes/geoip-jun2016

diff --git a/ChangeLog b/ChangeLog
index f03e25e52..a1b0a515f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Changes in version 0.2.8.4-rc - 2016-06-15
       by nickname, and one such relay is found, but it is not officially
       Named. Fixes bug 19203; bugfix on 0.2.3.1-alpha.
 
+  o Minor features (build):
+    - Tor now builds once again with the recent OpenSSL 1.1 development
+      branch (tested against 1.1.0-pre5 and 1.1.0-pre6-dev).
+
   o Minor features (geoip):
     - Update geoip and geoip6 to the June 7 2016 Maxmind GeoLite2
       Country database.
diff --git a/changes/bug19191 b/changes/bug19191
deleted file mode 100644
index 8670aaa7f..000000000
--- a/changes/bug19191
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (downloading):
-    - Predict more correctly whether we'll be downloading over HTTP when we
-      determine the maximum length of a URL. This should avoid a "BUG"
-      warning about the Squid HTTP proxy and its URL limits. Fixes bug 19191;
-      bugfix on ?????.
diff --git a/changes/bug19203 b/changes/bug19203
deleted file mode 100644
index 96bc1e855..000000000
--- a/changes/bug19203
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes (user interface):
-    - Correctly give a warning in the cases where a relay is specified by
-      nickname, and one such relay is found, but it is not officially Named.
-      Fixes bug 19203; bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug19213 b/changes/bug19213
deleted file mode 100644
index 6217814fb..000000000
--- a/changes/bug19213
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Cause the unit tests to compile correctly on mingw64 versions
-      that lack sscanf. Fixes bug 19213; bugfix on 0.2.7.1-alpha.
diff --git a/changes/bug19406 b/changes/bug19406
deleted file mode 100644
index e8b661b51..000000000
--- a/changes/bug19406
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (build):
-    - Tor now again builds with the recent OpenSSL 1.1 development branch
-      (tested against 1.1.0-pre5 and 1.1.0-pre6-dev).
-
diff --git a/changes/geoip-jun2016 b/changes/geoip-jun2016
deleted file mode 100644
index 6c9847ca5..000000000
--- a/changes/geoip-jun2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the June 7 2016 Maxmind GeoLite2
-      Country database.
-