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 | 44019d73ff56fddb389509d30f0d304e78cd9939 (patch) | |
tree | 4873cd73fac93fecfa957bb2cfdb4358a2e66d87 | |
parent | 87b2047f9e417dc020714decc3c9a899e95cf46b (diff) | |
parent | f7f55acae96c391767fec94f8a1932b5d4645897 (diff) | |
download | tor-44019d73ff56fddb389509d30f0d304e78cd9939.tar.gz tor-44019d73ff56fddb389509d30f0d304e78cd9939.zip |
Merge branch 'maint-0.3.0' into release-0.3.0
-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. |