diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-21 14:30:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-21 14:30:09 -0400 |
| commit | e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da (patch) | |
| tree | 1a57d4d9c6eab38afcafa770f37f5272a72897d4 /changes | |
| parent | fa8bb25f642a4fc57d44951d0192a26dd5a66c5b (diff) | |
| parent | 75501dbe4a70914ec8f19689849d3539d87be271 (diff) | |
| download | tor-e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da.tar.gz tor-e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-july2014 | 3 | ||||
| -rw-r--r-- | changes/geoip6-july2014 | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/geoip-july2014 b/changes/geoip-july2014 new file mode 100644 index 0000000000..a0523ecac9 --- /dev/null +++ b/changes/geoip-july2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-july2014 b/changes/geoip6-july2014 new file mode 100644 index 0000000000..155788ef88 --- /dev/null +++ b/changes/geoip6-july2014 @@ -0,0 +1,2 @@ + o Minor features: + - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database. |