diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-07-29 10:23:29 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-07-29 10:23:29 -0400 |
commit | 258988ca51bab7414aefb621532cf078eda18dab (patch) | |
tree | e8c7777822e3cb6df7eaeac10ce919814d7d1854 /changes | |
parent | 845d3fefac2916858890320027ebea31a791d9cc (diff) | |
parent | 1c4a2dd208601aca9fdd004929c283b9d44d7442 (diff) | |
download | tor-258988ca51bab7414aefb621532cf078eda18dab.tar.gz tor-258988ca51bab7414aefb621532cf078eda18dab.zip |
Merge branch 'maint-0.2.8' into release-0.2.8
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug19782 | 3 | ||||
-rw-r--r-- | changes/geoip-july2016 | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug19782 b/changes/bug19782 new file mode 100644 index 0000000000..37660ead73 --- /dev/null +++ b/changes/bug19782 @@ -0,0 +1,3 @@ + o Minor bugfixes (fallback directories): + - Remove a fallback that was on the hardcoded list, then opted-out. + Fixes bug 19782; update to fallback list from 0.2.8.2-alpha. diff --git a/changes/geoip-july2016 b/changes/geoip-july2016 new file mode 100644 index 0000000000..d9963bd6a8 --- /dev/null +++ b/changes/geoip-july2016 @@ -0,0 +1,4 @@ + o Minor features: + - Update geoip and geoip6 to the July 6 2016 Maxmind GeoLite2 + Country database. + |