diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-24 09:19:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-24 09:19:06 -0500 |
| commit | 5b55778c86b88329725521d2c93829a9c9ad3501 (patch) | |
| tree | 99ceb6908c5d241e64fac071c13588a7cbdf5dcc /changes | |
| parent | 0872d8e3cf3281fc5831375252db9e39de12e927 (diff) | |
| parent | 137982f955b297b41a89086d672baf761825c152 (diff) | |
| download | tor-5b55778c86b88329725521d2c93829a9c9ad3501.tar.gz tor-5b55778c86b88329725521d2c93829a9c9ad3501.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-november2014 | 3 | ||||
| -rw-r--r-- | changes/geoip6-november2014 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-november2014 b/changes/geoip-november2014 new file mode 100644 index 0000000000..52cbeb3e41 --- /dev/null +++ b/changes/geoip-november2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the November 15 2014 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-november2014 b/changes/geoip6-november2014 new file mode 100644 index 0000000000..e91fcc0d3b --- /dev/null +++ b/changes/geoip6-november2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the November 15 2014 Maxmind GeoLite2 Country database. + |