[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d979e7f56715d33d4bee0805d0a01ef83886117d (commit)
       via  68072bcfe1cea2c8026a76b01cdc4db3c1172d9c (commit)
      from  235f9329304ab9e75e43dc5a409901fc3b3de9ca (commit)


- Log -----------------------------------------------------------------
commit d979e7f56715d33d4bee0805d0a01ef83886117d
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 19 15:58:45 2016 +0100

    Prepare for 1.1.0-pre6-dev
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 68072bcfe1cea2c8026a76b01cdc4db3c1172d9c
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 19 15:57:51 2016 +0100

    Prepare for 1.1.0-pre5 release
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 README                     | 2 +-
 include/openssl/opensslv.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 3ad8af2..edcf59e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-pre5-dev
+ OpenSSL 1.1.0-pre6-dev
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index d85d1f3..bfb87a6 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10100005L
+# define OPENSSL_VERSION_NUMBER  0x10100006L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre5-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre6-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre5-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre6-dev  xx XXX xxxx"
 # endif
 
 /*-