summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-03-11 14:03:06 -0400
committerRoger Dingledine <arma@torproject.org>2013-03-11 14:03:06 -0400
commitfcd9248387249d68619734a73860ffaab12b021b (patch)
treefb7d736c563792b65b4d82eb5f57452b1a6d698d
parent790ddd6e0af1be48dc842a28c1599a6027f85b30 (diff)
downloadtor-0.2.4.11-alpha.tar.gz
tor-0.2.4.11-alpha.zip
fold in changes entrytor-0.2.4.11-alpha
-rw-r--r--ChangeLog2
-rw-r--r--changes/geoip-mar20133
2 files changed, 1 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 74ac362753..1c21c10a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,7 +69,7 @@ Changes in version 0.2.4.11-alpha - 2013-03-11
we could wind up in a situation where users with such backends would
be distinguishable from users without. Fixes bug 8121; bugfix on
0.2.4.8-alpha.
- - Update to the February 6 2013 Maxmind GeoLite Country database.
+ - Update to the March 6 2013 Maxmind GeoLite Country database.
o Minor bugfixes (clients):
- When we receive a RELAY_END cell with the reason DONE, or with no
diff --git a/changes/geoip-mar2013 b/changes/geoip-mar2013
deleted file mode 100644
index e9cc3981b3..0000000000
--- a/changes/geoip-mar2013
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the March 6 2013 Maxmind GeoLite Country database.
-