diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-09 16:24:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-09 16:24:44 -0400 |
| commit | 306f2f0eff1b7d1c4bbee8b600a962d537c566f3 (patch) | |
| tree | 9194496e8c9c1a258de2bedc5145192f900df8e2 /changes | |
| parent | 64bfc2930ac0be3af669636c16f6f0bba715056f (diff) | |
| parent | 220e9be0959241ce5ea36f64bc08245292a6b06c (diff) | |
| download | tor-306f2f0eff1b7d1c4bbee8b600a962d537c566f3.tar.gz tor-306f2f0eff1b7d1c4bbee8b600a962d537c566f3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-march2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-march2015 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-march2015 b/changes/geoip-march2015 new file mode 100644 index 0000000000..565781280a --- /dev/null +++ b/changes/geoip-march2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015 new file mode 100644 index 0000000000..9a38c65e62 --- /dev/null +++ b/changes/geoip6-march2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. + |