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 | f7f55acae96c391767fec94f8a1932b5d4645897 (patch) | |
tree | ac17828e8ef7ff411d91bc32706eee000d042ac4 | |
parent | ad7db10770a396b1794364b9ec17dd4c17ee14dc (diff) | |
parent | 43ebe54a24d3210ef037f7e2b67fad9597361bab (diff) | |
download | tor-f7f55acae96c391767fec94f8a1932b5d4645897.tar.gz tor-f7f55acae96c391767fec94f8a1932b5d4645897.zip |
Merge branch 'maint-0.2.9' into maint-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. |