From a29d22de793a634537057840919f061b71283a86 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 5 Dec 2016 16:58:27 -0800
Subject: Changelog re #334, close #334

---
 sites/www/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0a96258d..e4555e32 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+* :bug:`334` Make the ``subprocess`` import in ``proxy.py`` lazy so users on
+  platforms without it (such as Google App Engine) can import Paramiko
+  successfully. (Relatedly, make it easier to tweak an active socket check
+  timeout  [in `Transport <paramko.transport.Transport>`] which was previously
+  hardcoded.) Credit: Shinya Okano.
 * :support:`854 backported` Fix incorrect docstring/param-list for
   `Transport.auth_gssapi_keyex
   <paramiko.transport.Transport.auth_gssapi_keyex>` so it matches the real
-- 
cgit v1.2.3