Apply 7717-v2.patch 

refs #7717


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/ssh-diffie-hellman-group14-sha1-7717@43488 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb