Merge branch '2.1'

devent · Jun 9, 2017 · ee587a3 · ee587a3
2 parents abdd42d + 7fe4373
commit ee587a3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :support:`906 (1.18+)` Clean up a handful of outdated imports and related
+  tweaks. Thanks to Pierce Lopez.
 * :bug:`984` Enhance default cipher preference order such that
   ``aes(192|256)-cbc`` are preferred over ``blowfish-cbc``. Thanks to Alex
   Gaynor.