From dd4f5bc8a778502a769d3e32d0f238f74e6af845 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 21 Jul 2014 14:58:01 -0400 Subject: [PATCH] fold in the changes entries so far --- ChangeLog | 6 ++++++ ReleaseNotes | 6 ++++++ changes/geoip-july2014 | 3 --- changes/geoip6-july2014 | 2 -- changes/geoip6-june2014 | 2 -- 5 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 changes/geoip-july2014 delete mode 100644 changes/geoip6-july2014 delete mode 100644 changes/geoip6-june2014 diff --git a/ChangeLog b/ChangeLog index 56ae07ae6..f298d535c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Changes in version 0.2.4.23 - 2014-07-2? + o Minor features: + - Update geoip and geoip6 to the July 10 2014 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.4.22 - 2014-05-16 Tor 0.2.4.22 backports numerous high-priority fixes from the Tor 0.2.5 alpha release series. These include blocking all authority signing diff --git a/ReleaseNotes b/ReleaseNotes index 19185a296..1bc3413c8 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,12 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.4.23 - 2014-07-2? + o Minor features: + - Update geoip and geoip6 to the July 10 2014 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.4.22 - 2014-05-16 Tor 0.2.4.22 backports numerous high-priority fixes from the Tor 0.2.5 alpha release series. These include blocking all authority signing diff --git a/changes/geoip-july2014 b/changes/geoip-july2014 deleted file mode 100644 index a0523ecac..000000000 --- a/changes/geoip-july2014 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-july2014 b/changes/geoip6-july2014 deleted file mode 100644 index 155788ef8..000000000 --- a/changes/geoip6-july2014 +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features: - - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database. diff --git a/changes/geoip6-june2014 b/changes/geoip6-june2014 deleted file mode 100644 index 1a33e6fb4..000000000 --- a/changes/geoip6-june2014 +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the June 4 2014 Maxmind GeoLite2 Country database.