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 | bad224df85236956708183ff00d0d6bd94dc46ae (patch) | |
tree | dec0c760c0843f27ac382891a857a57117ef4a7c | |
parent | adec001c9a1e173e647b9b74ee4fb82871f86cb3 (diff) | |
parent | 91c17ffbd61348e63cac81e90583f0b22b3c17d4 (diff) | |
download | tor-bad224df85236956708183ff00d0d6bd94dc46ae.tar.gz tor-bad224df85236956708183ff00d0d6bd94dc46ae.zip |
Merge branch 'maint-0.2.8' into release-0.2.8
-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. |