diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 08:53:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 08:53:21 -0500 |
| commit | d8517fe8435dbe9e4593d04fa8ec4db464513892 (patch) | |
| tree | dcc5b1ae3ff9383a9b1ce887239e7e41d116e682 /changes | |
| parent | 4a6b43bf76a993b0167f28f875cd4cf922daba71 (diff) | |
| parent | 7cbdec578b291da11dcd419988ee985b7589ec48 (diff) | |
| download | tor-d8517fe8435dbe9e4593d04fa8ec4db464513892.tar.gz tor-d8517fe8435dbe9e4593d04fa8ec4db464513892.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-january2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-january2015 | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/geoip-january2015 b/changes/geoip-january2015 new file mode 100644 index 0000000000..67324f27f2 --- /dev/null +++ b/changes/geoip-january2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-january2015 b/changes/geoip6-january2015 new file mode 100644 index 0000000000..b86fe2be57 --- /dev/null +++ b/changes/geoip6-january2015 @@ -0,0 +1,2 @@ + o Minor features: + - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database. |