# HG changeset patch
# User Robey Pointer <robey@lag.net>
# Date 1215393741 25200
#      Sun Jul 06 18:22:21 2008 -0700
# Node ID 01915659433020c85c7ec7b165ac28710dc84337
# Parent  c055d3f3b761cd8ab4e3cbe0b5a66295cff1a450
[project @ robey@lag.net-20080707012221-5fz3q4j2gvqlbmhl]
bump version to 1.7.4 (desmond).

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@
 # amy (10jun07) - 1.7.1
 # basil (21jan08) - 1.7.2
 # clara (23mar08) - 1.7.3
+# desmond (06jul08) - 1.7.4
 
 
 ifeq ($(wildcard /sbin/md5),/sbin/md5)
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,14 @@
 Releases
 ========
 
+v1.7.4 (Desmond) 06jul08
+------------------------
+  * more randpool fixes for windows, from Dwayne Litzenberger
+    (NOTE: this may require a pycrypto upgrade on windows)
+  * fix potential deadlock during key exchange (Dwayne Litzenberger)
+  * remove MFC dependency from windows (Mark Hammond)
+  * added some optional API improvements for SFTPClient get() and put()
+
 v1.7.3 (Clara) 23mar08
 ----------------------
   * SSHClient can be asked not to use an SSH agent now, and not to search
diff --git a/README b/README
--- a/README
+++ b/README
@@ -4,15 +4,15 @@
 ========
 
 :Paramiko: Python SSH module
-:Copyright: Copyright (c) 2003-2007  Robey Pointer <robey@lag.net>
+:Copyright: Copyright (c) 2003-2008  Robey Pointer <robey@lag.net>
 :License: LGPL
 :Homepage: http://www.lag.net/paramiko/
 
 
-paramiko 1.7.3
+paramiko 1.7.4
 ==============
 
-"Clara" release, 23 march 2008
+"Desmond" release, 06 july 2008
 
 
 What
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -47,7 +47,7 @@
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.7.3 (Clara)
+@version: 1.7.4 (Desmond)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -60,9 +60,9 @@
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "23 Mar 2008"
-__version__ = "1.7.3 (Clara)"
-__version_info__ = (1, 7, 3)
+__date__ = "06 Jul 2008"
+__version__ = "1.7.4 (Desmond)"
+__version_info__ = (1, 7, 4)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -194,7 +194,7 @@
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.7.3'
+    _CLIENT_ID = 'paramiko_1.7.4'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2007  Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2008  Robey Pointer <robey@lag.net>
 #
 # This file is part of paramiko.
 #
@@ -48,13 +48,13 @@
 
 
 setup(name = "paramiko",
-      version = "1.7.3",
+      version = "1.7.4",
       description = "SSH2 protocol library",
       author = "Robey Pointer",
       author_email = "robey@lag.net",
       url = "http://www.lag.net/paramiko/",
       packages = [ 'paramiko' ],
-      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.7.3.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.7.4.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',