simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  3b4f326 Merge SSH-2-only default from 'pre-0.64'.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:           2014-11-08 19:37:45

commit 3b4f3266d84068d75a099102778e2464a2832362
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=3b4f3266d84068d75a099102778e2464a2832362;hp=5ffb20e4bf58cab31e066bc8cbdd4d4d94137eb0
Merge: 5ffb20e 9090c1b
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Sat Nov 8 19:35:57 2014 +0000

    Merge SSH-2-only default from 'pre-0.64'.