[tor-commits] [tor/release-0.4.6] Fold geoip changelog entry into 0.4.6.3-rc changelog

[nickm at torproject.org]

commit 8222f2f3ee6e0629fbe2fead76a6b20de7dc23f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:55:17 2021 -0400

    Fold geoip changelog entry into 0.4.6.3-rc changelog
---
 ChangeLog                | 4 ++++
 changes/geoip-2021-05-07 | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 617a39576d..cfc02f7883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@ Changes in version 0.4.6.3-rc - 2021-05-10
     - Make the autoconf script build correctly with autoconf versions
       2.70 and later. Closes part of ticket 40335.
 
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2021/05/07.
+
   o Minor features (onion services):
     - Add a warning message when trying to connect to (no longer
       supported) v2 onion services. Closes ticket 40373.
diff --git a/changes/geoip-2021-05-07 b/changes/geoip-2021-05-07
deleted file mode 100644
index 07bf12c4d8..0000000000
--- a/changes/geoip-2021-05-07
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (geoip data):
-    - Update the geoip files to match the IPFire Location Database,
-      as retrieved on 2021/05/07.