diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:57 -0400 |
| commit | 938deecc876e110d708edda544d20d9fd752838e (patch) | |
| tree | 9069aad92da78b718226abbea4e649c363885191 /changes | |
| parent | bb68c731b897a967a4b7eb138728fa077617646e (diff) | |
| parent | fa7ce6d3be62061de73176ffb939aa8d353d4014 (diff) | |
| download | tor-938deecc876e110d708edda544d20d9fd752838e.tar.gz tor-938deecc876e110d708edda544d20d9fd752838e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug12830 | 4 | ||||
| -rw-r--r-- | changes/geoip-august2014 | 3 | ||||
| -rw-r--r-- | changes/geoip6-august2014 | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug12830 b/changes/bug12830 new file mode 100644 index 0000000000..835ebe2fa7 --- /dev/null +++ b/changes/bug12830 @@ -0,0 +1,4 @@ + o Documentation: + - Adjust the URLs in the README to refer to the new locations of + several documents on the website. Patch from Matt Pagan. Fixes + bug 12830. diff --git a/changes/geoip-august2014 b/changes/geoip-august2014 new file mode 100644 index 0000000000..90d8ecb300 --- /dev/null +++ b/changes/geoip-august2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-august2014 b/changes/geoip6-august2014 new file mode 100644 index 0000000000..7e7c9a975d --- /dev/null +++ b/changes/geoip6-august2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. + |