[openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  bb36ec5f5bc6a34370e821260ad4f620dd16ecec (commit)
      from  0f283c9a665c5dc5cd2b89a3373da34f144ebd64 (commit)


- Log -----------------------------------------------------------------
commit bb36ec5f5bc6a34370e821260ad4f620dd16ecec
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 27 21:38:00 2019 +0200

    Add CHANGES for 1.0.2s
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9019)

-----------------------------------------------------------------------

Summary of changes:
 CHANGES | 9 +++++----
 NEWS    | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 38864c1..1b62a06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,10 +17,11 @@
 
   *) Add FIPS support for Android Arm 64-bit
 
-     Support for Android Arm 64-bit was added to the OpenSSL FIPS Object Module in
-     Version 2.0.10. For some reason, the corresponding target 'android64-aarch64'
-     was missing OpenSSL 1.0.2, whence it could not be built with FIPS support on
-     Android Arm 64-bit. This omission has been fixed.
+     Support for Android Arm 64-bit was added to the OpenSSL FIPS Object
+     Module in Version 2.0.10. For some reason, the corresponding target
+     'android64-aarch64' was missing OpenSSL 1.0.2, whence it could not be
+     built with FIPS support on Android Arm 64-bit. This omission has been
+     fixed.
      [Matthias St. Pierre]
 
  Changes between 1.0.2q and 1.0.2r [26 Feb 2019]
diff --git a/NEWS b/NEWS
index a92af92..4d4e9df 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,6 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 1.0.2r and OpenSSL 1.0.2s [under development]
-
-      o
-
   Major changes between OpenSSL 1.0.2q and OpenSSL 1.0.2r [26 Feb 2019]
 
       o 0-byte record padding oracle (CVE-2019-1559)