diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-03-21 11:01:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-21 11:01:47 -0400 |
| commit | 3a547076b6ff2a043f7d751426e34b6408754369 (patch) | |
| tree | 1dc75f823adeddb0176907aed4db81e9e36bac91 /changes | |
| parent | ddd30f966a4b186d42650e3b321da8352a19b5f5 (diff) | |
| parent | 920e3d6a191486a5879aa0f2e0bfcf743d075c12 (diff) | |
| download | tor-3a547076b6ff2a043f7d751426e34b6408754369.tar.gz tor-3a547076b6ff2a043f7d751426e34b6408754369.zip | |
Merge branch 'maint-0.2.7'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug14821 | 4 | ||||
| -rw-r--r-- | changes/bug18162 | 2 | ||||
| -rw-r--r-- | changes/geoip-march2016 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/changes/bug14821 b/changes/bug14821 index 0920d1fffc..e9ccc2fd1b 100644 --- a/changes/bug14821 +++ b/changes/bug14821 @@ -1,4 +1,4 @@ o Major bugfixes (compilation): - - Correctly repair hardened builds under the clang compiler. Previously, + - Repair hardened builds under the clang compiler. Previously, our use of _FORTIFY_SOURCE would conflict with clang's address - sanitizer. Closes ticket 14821. + sanitizer. Fixes bug 14821; bugfix on 0.2.5.4-alpha. diff --git a/changes/bug18162 b/changes/bug18162 index 0844d6f62f..88d19a87cc 100644 --- a/changes/bug18162 +++ b/changes/bug18162 @@ -1,7 +1,7 @@ o Major bugfixes (security, pointers): - Avoid a difficult-to-trigger heap corruption attack when extending - a smartlist to contain over 16GB of pointers. Fixes bug #18162; + a smartlist to contain over 16GB of pointers. Fixes bug 18162; bugfix on Tor 0.1.1.11-alpha, which fixed a related bug incompletely. Reported by Guido Vranken. diff --git a/changes/geoip-march2016 b/changes/geoip-march2016 index d7b1bd42f9..a66599f5a9 100644 --- a/changes/geoip-march2016 +++ b/changes/geoip-march2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the March 3 2016 Maxmind GeoLite2 Country database. |