diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:19:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:19:13 -0500 |
| commit | 40718f2499d85f10f6a708ee0267b2fbd15998b6 (patch) | |
| tree | 1bd82cebe9a45bb862291dfeb3fc73b11cc89e65 | |
| parent | 5639f3a61e228ddc61586eb53de31400735c223d (diff) | |
| parent | 9994404238e6b87907f811cab2a5126d030ff55d (diff) | |
| download | tor-40718f2499d85f10f6a708ee0267b2fbd15998b6.tar.gz tor-40718f2499d85f10f6a708ee0267b2fbd15998b6.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/20460 | 4 | ||||
| -rw-r--r-- | changes/bug20587 | 1 | ||||
| -rw-r--r-- | changes/bug20588 | 2 | ||||
| -rw-r--r-- | changes/geoip-november2016 | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/changes/20460 b/changes/20460 index d51ec3ad96..9fbb4a7986 100644 --- a/changes/20460 +++ b/changes/20460 @@ -1,4 +1,4 @@ - o Minor bugfixes (testing) + o Minor bugfixes (testing): - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has removed the ECDH ciphers which caused the tests to fail on - platforms which use it. Closes ticket 20460. + platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20587 b/changes/bug20587 index a05933427c..341b001363 100644 --- a/changes/bug20587 +++ b/changes/bug20587 @@ -1,4 +1,3 @@ - o Minor bugfixes (download timing): - When determining when to download a directory object, handle times after 2038 if the operating system supports that. (Someday this will be diff --git a/changes/bug20588 b/changes/bug20588 index be199b2de0..832ef81336 100644 --- a/changes/bug20588 +++ b/changes/bug20588 @@ -1,3 +1,3 @@ - o Minor bugfixes (portability): + o Minor features (portability): - Fix compilation with OpenSSL 1.1 and less commonly-used CPU architectures. Closes ticket 20588. diff --git a/changes/geoip-november2016 b/changes/geoip-november2016 index 5190ed66f4..b3f9913bb1 100644 --- a/changes/geoip-november2016 +++ b/changes/geoip-november2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (ge0oip): - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 Country database. |