From f475467ee3720c6220aab047d0dae5213ddcec41 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Fri, 9 Dec 2016 11:03:27 +0100
Subject: [PATCH] 5.2.17 release

---
 changelog.md        | 14 ++++++++++++++
 class.phpmailer.php |  2 +-
 class.pop3.php      |  2 +-
 class.smtp.php      |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 39b7c5a8..6e7095de 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,19 @@
 # ChangeLog
 
+## Version 5.2.17 (December 9th 2016)
+* This is officially the last feature release of 5.2. Security fixes only from now on; use PHPMailer 6.0!
+* Added ability to extract SMTP transaction ID from successful submissions
+* Allow DKIM private key to be provided as a string
+* Provide mechanism to allow overriding of boundary and message ID creation
+* Improve Brazilian Portuguese, Spanish, Swedish, Romanian, and German translations
+* PHP 7.1 support for Travis-CI
+* Fix some language codes
+* Add security notices
+* Improve DKIM compatibility in older PHP versions
+* Improve trapping and capture of SMTP connection errors
+* Improve passthrough of error levels for debug output
+* PHPDoc cleanup
+
 ## Version 5.2.16 (June 6th 2016)
 * Added DKIM example
 * Fixed empty additional_parameters problem
diff --git a/class.phpmailer.php b/class.phpmailer.php
index 7739b108..2fab1add 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @var string
      */
-    public $Version = '5.2.16';
+    public $Version = '5.2.17';
 
     /**
      * Email priority.
diff --git a/class.pop3.php b/class.pop3.php
index 56ad1bfc..ae6d5d59 100644
--- a/class.pop3.php
+++ b/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @var string
      * @access public
      */
-    public $Version = '5.2.16';
+    public $Version = '5.2.17';
 
     /**
      * Default POP3 port number.
diff --git a/class.smtp.php b/class.smtp.php
index b5a7ccc0..f50747c0 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @var string
      */
-    const VERSION = '5.2.16';
+    const VERSION = '5.2.17';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.16';
+    public $Version = '5.2.17';
 
     /**
      * SMTP server port number.