diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-13 14:21:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-13 14:21:47 -0400 |
| commit | a427a7c479d633ad74819729eb2412c5c5e9e97e (patch) | |
| tree | f5ebade95f7704532aa28e17c6f65b1857082f51 /changes | |
| parent | 4c90cdc0e7850a1a97ce064fc1496e6dc258fc0a (diff) | |
| parent | 60b8aaefa1b1d0d828f04778df970e65a87eb2d6 (diff) | |
| download | tor-a427a7c479d633ad74819729eb2412c5c5e9e97e.tar.gz tor-a427a7c479d633ad74819729eb2412c5c5e9e97e.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug19213 | 2 | ||||
| -rw-r--r-- | changes/geoip-jun2016 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug19213 b/changes/bug19213 index f912ffb0c3..6217814fb4 100644 --- a/changes/bug19213 +++ b/changes/bug19213 @@ -1,3 +1,3 @@ o Minor bugfixes (compilation): - Cause the unit tests to compile correctly on mingw64 versions - that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha. + that lack sscanf. Fixes bug 19213; bugfix on 0.2.7.1-alpha. diff --git a/changes/geoip-jun2016 b/changes/geoip-jun2016 index 8d308f6f72..6c9847ca58 100644 --- a/changes/geoip-jun2016 +++ b/changes/geoip-jun2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the June 7 2016 Maxmind GeoLite2 Country database. |