[or-cvs] [tor/release-0.2.1 08/12] merge changes files

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Thu, 16 Dec 2010 16:31:52 -0500
Subject: merge changes files
Commit: df16e99718fd22f5b507b6eec9ec4262022b5116

---
 ChangeLog              |    8 ++++++++
 changes/gabelmoo-newip |    3 ---
 changes/geoip-dec2010  |    3 ---
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 changes/gabelmoo-newip
 delete mode 100644 changes/geoip-dec2010

diff --git a/ChangeLog b/ChangeLog
index b97d20b..3131594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes in version 0.2.1.28 - 2010-12-16
+  o Directory authority changes:
+    - Change IP address and ports for gabelmoo (v3 directory authority).
+
+  o Minor features:
+    - Update to the December 1 2010 Maxmind GeoLite Country database.
+
+
 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
diff --git a/changes/gabelmoo-newip b/changes/gabelmoo-newip
deleted file mode 100644
index 8e9a19c..0000000
--- a/changes/gabelmoo-newip
+++ /dev/null
@@ -1,3 +0,0 @@
- o Directory authority changes:
-    - Change IP address and ports for gabelmoo (v3 directory authority).
-
diff --git a/changes/geoip-dec2010 b/changes/geoip-dec2010
deleted file mode 100644
index d6247ce..0000000
--- a/changes/geoip-dec2010
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the December 1 2010 Maxmind GeoLite Country database.
-
-- 
1.7.1