[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a6da6b73ca480cfa6fe8d0a882f4ff549d46fcff (commit)
      from  b9ed9ab38e492fa070c3d7ed63233e3debc36528 (commit)


- Log -----------------------------------------------------------------
commit a6da6b73ca480cfa6fe8d0a882f4ff549d46fcff
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 9 09:12:47 2018 +0100

    Revert ".travis.yml: remove osx from build matrix."
    
    Recent changes seem to have gotten OS X back on track, so we should be
    able to run our tests there again.
    
    This reverts commit e12e903e9ac675d08f9dd0db1f0c1a2049232c21.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5292)

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

Summary of changes:
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cfc11b6..0586fb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ addons:
 
 os:
     - linux
+    - osx
 
 compiler:
     - clang