aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-12-16 16:31:52 -0500
committerRoger Dingledine <arma@torproject.org>2010-12-16 16:31:52 -0500
commitdf16e99718fd22f5b507b6eec9ec4262022b5116 (patch)
tree808647bf42865d083d2658c360e688cc360760af
parent75bead1246720beb7417e6e7b28c90a63c3d0a07 (diff)
downloadtor-df16e99718fd22f5b507b6eec9ec4262022b5116.tar.gz
tor-df16e99718fd22f5b507b6eec9ec4262022b5116.zip
merge changes files
-rw-r--r--ChangeLog8
-rw-r--r--changes/gabelmoo-newip3
-rw-r--r--changes/geoip-dec20103
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b97d20b4ea..3131594281 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 8e9a19c657..0000000000
--- 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 d6247cee6b..0000000000
--- a/changes/geoip-dec2010
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the December 1 2010 Maxmind GeoLite Country database.
-