From 74de8a137d435d45c100b74cc971be556166a559 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 16 May 2018 15:12:28 -0400
Subject: 18.0.0 release time (#760)

---
 CHANGELOG.rst          | 2 +-
 src/OpenSSL/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1a659a0..a7b9e58 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,7 @@ Changelog
 Versions are year-based with a strict backward-compatibility policy.
 The third digit is only for regressions.
 
-18.0.0 (UNRELEASED)
+18.0.0 (2018-05-16)
 -------------------
 
 
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 0b508b0..4607bc4 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@ __all__ = [
     "__title__", "__uri__", "__version__",
 ]
 
-__version__ = "17.6.0.dev0"
+__version__ = "18.0.0"
 
 __title__ = "pyOpenSSL"
 __uri__ = "https://pyopenssl.org/"
-- 
cgit v1.2.1