[or-cvs] [tor/release-0.2.1 2/2] fold in geoip changes commit

arma at torproject.org arma at torproject.org
Tue Nov 23 03:37:22 UTC 2010


Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 22 Nov 2010 22:36:35 -0500
Subject: fold in geoip changes commit
Commit: 05319e4d597e687d660c5ef8edd1bb00108b5ab8

---
 ChangeLog             |    3 +--
 changes/geoip-nov2010 |    3 ---
 2 files changed, 1 insertions(+), 5 deletions(-)
 delete mode 100644 changes/geoip-nov2010

diff --git a/ChangeLog b/ChangeLog
index 4f03741..57b23e7 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 e77da6e..0000000
--- a/changes/geoip-nov2010
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the November 1 2010 Maxmind GeoLite Country database.
-
-- 
1.7.1



More information about the tor-commits mailing list