Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-07 16:19:13 -05:00 · 2016-11-07 16:19:13 -05:00 · 40718f2499
parent 5639f3a61e 9994404238
commit 40718f2499
4 changed files with 4 additions and 5 deletions
--- 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.
--- 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
--- 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.
--- 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.