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 | 558eafe56e0d3fd0d769a330cecc9f02f85aa8a6 (patch) | |
tree | 8dbfab35e2e19e60dc7d1d83f3c8501769d125ae | |
parent | e2979ebe252cb1a361b4c4aea1cbfce74697ec39 (diff) | |
parent | 2e21493a88c264e2df91078c3f14f269854755ef (diff) | |
download | tor-558eafe56e0d3fd0d769a330cecc9f02f85aa8a6.tar.gz tor-558eafe56e0d3fd0d769a330cecc9f02f85aa8a6.zip |
Merge branch 'maint-0.2.5' into release-0.2.5
-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. |