diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-10-05 11:04:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-10-05 11:04:59 -0400 |
commit | 7a4741c2336341449212f635672102d5ba391276 (patch) | |
tree | 54a267e70a90b491c9679620d586792f5a06a57c /changes | |
parent | bdf60fc7ce40d5f78ac1f995447d104be48cbcea (diff) | |
parent | f7f55acae96c391767fec94f8a1932b5d4645897 (diff) | |
download | tor-7a4741c2336341449212f635672102d5ba391276.tar.gz tor-7a4741c2336341449212f635672102d5ba391276.zip |
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'changes')
-rw-r--r-- | changes/geoip-october2017 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/geoip-october2017 b/changes/geoip-october2017 index 547f2ccfd6..11f623e85f 100644 --- a/changes/geoip-october2017 +++ b/changes/geoip-october2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 Country database. |