diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-01-22 18:54:25 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-01-22 18:54:25 -0500 |
commit | 98990452564a6c3f70bce05a299d84fb7c0024a3 (patch) | |
tree | 0ba50faa452b9e0481130bec9d85c652366cd155 | |
parent | 2c9ce8de3dcd649fae8ef75d120e6448c760d4cf (diff) | |
parent | 46aee42cb99dcf3cba69091aeceb1f61d3961f3a (diff) | |
download | tor-98990452564a6c3f70bce05a299d84fb7c0024a3.tar.gz tor-98990452564a6c3f70bce05a299d84fb7c0024a3.zip |
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r-- | changes/geoip-january2017 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/geoip-january2017 b/changes/geoip-january2017 index de1a4cbe2a..77bc9a5991 100644 --- a/changes/geoip-january2017 +++ b/changes/geoip-january2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2 Country database. |