aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-11-22 22:36:35 -0500
committerRoger Dingledine <arma@torproject.org>2010-11-22 22:36:35 -0500
commit05319e4d597e687d660c5ef8edd1bb00108b5ab8 (patch)
tree27a5efe738114081bdfcda912033b77ab85d357e
parent4c549fec8f0d7e3b1a570a6904d19b15b230cc93 (diff)
downloadtor-05319e4d597e687d660c5ef8edd1bb00108b5ab8.tar.gz
tor-05319e4d597e687d660c5ef8edd1bb00108b5ab8.zip
fold in geoip changes commit
-rw-r--r--ChangeLog3
-rw-r--r--changes/geoip-nov20103
2 files changed, 1 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f03741527..57b23e7c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.27 - 2010-11-22
+Changes in version 0.2.1.27 - 2010-11-23
Yet another OpenSSL security patch broke its compatibility with Tor:
Tor 0.2.1.27 makes relays work with openssl 0.9.8p and 1.0.0.b. We
also took this opportunity to fix several crash bugs, integrate a new
@@ -30,7 +30,6 @@ Changes in version 0.2.1.27 - 2010-11-22
0.2.0.3-alpha; fixes bug 1981.
o Major features:
-XXX cherry-pick the november geoip commit
- Move to the November 2010 Maxmind GeoLite country db (rather
than the June 2009 ip-to-country GeoIP db) for our statistics that
count how many users relays are seeing from each country. Now we'll
diff --git a/changes/geoip-nov2010 b/changes/geoip-nov2010
deleted file mode 100644
index e77da6e278..0000000000
--- a/changes/geoip-nov2010
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the November 1 2010 Maxmind GeoLite Country database.
-