From 73e9cb5f8c687d38082a60878d467f34eef0ede8 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 30 Jun 2014 09:58:48 -0700
Subject: [PATCH] CHANGELOG: Document this branch

Documents the following commits:
* 2369d56 Added the option "smtp-ssl-protocol" to make STARTTLS work
  on Python 3.3+

Signed-off-by: W. Trevor King <wking@tremily.us>
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ec9b1c1..a893285 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 v3.9 (unreleased)
+    * Add a new `smtp-ssl-protocol` setting, to select acceptable protocols for SMTP connections.
     * Fix non-compliant User-Agent header for HTTP/1.1.
     * Fix an error in the NoToEmailAddress invocation.
     * Add a new `trust-link` setting, to prefer the `link` attribute over the `id` attribute for identifying entries.
-- 
2.26.2