summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-07-21 14:58:01 -0400
committerRoger Dingledine <arma@torproject.org>2014-07-21 14:58:01 -0400
commitdd4f5bc8a778502a769d3e32d0f238f74e6af845 (patch)
treea2c30723d4043f216fadddee095a5be616aea420
parent2998d384ec23677693b5894118d92efd0208dd5b (diff)
downloadtor-dd4f5bc8a778502a769d3e32d0f238f74e6af845.tar.gz
tor-dd4f5bc8a778502a769d3e32d0f238f74e6af845.zip
fold in the changes entries so far
-rw-r--r--ChangeLog6
-rw-r--r--ReleaseNotes6
-rw-r--r--changes/geoip-july20143
-rw-r--r--changes/geoip6-july20142
-rw-r--r--changes/geoip6-june20142
5 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 56ae07ae6f..f298d535cc 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 19185a2968..1bc3413c83 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 a0523ecac9..0000000000
--- 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 155788ef88..0000000000
--- 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 1a33e6fb45..0000000000
--- 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.