simon-git: putty (master): Simon Tatham

Sat Jun 27 08:27:27 BST 2020

TL;DR:
  ba6b4780 Merge the already-merged parts of the 0.74 branch.
  2762a202 Merge the 0.74 release branch back to master.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2020-06-27 08:27:27

commit ba6b47807cfc848e65e118a8dfaa882e7f06672d
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ba6b47807cfc848e65e118a8dfaa882e7f06672d;hp=2bbed67d9e088fe577edd3eaf6a8f4514bb38420
Merge: 2bbed67d 371c7d12
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Jun 27 08:04:58 2020 +0100

    Merge the already-merged parts of the 0.74 branch.

    This is a no-op merge, via 'git merge -s ours', which records that all
    the commits up to this point on the 0.74 branch are bug fixes
    cherry-picked from master, and don't need merging back to master.

    From this point onwards, the 0.74 branch will contain fresh work that
    _will_ need merging back to master. This preliminary non-merge allows
    me to avoid needless conflicts during that process.

commit 2762a2025f094bf8ccb75c0bdd7c655bc953f2f1
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=2762a2025f094bf8ccb75c0bdd7c655bc953f2f1;hp=ba6b47807cfc848e65e118a8dfaa882e7f06672d
Merge: ba6b4780 014d4fb1
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Jun 27 08:09:24 2020 +0100

    Merge the 0.74 release branch back to master.

    Two minor memory-leak fixes on 0.74 seem not to be needed on master:
    the fix in an early exit path of pageant_add_keyfile is done already
    on master in a different way, and the missing sfree(fdlist) in
    uxsftp.c is in code that's been completely rewritten in the uxcliloop
    refactoring.

    Other minor conflicts: the rework in commit b52641644905 of
    ssh1login.c collided with the change from FLAG_VERBOSE to
    seat_verbose(), and master and 0.74 each added an unrelated extra
    field to the end of struct SshServerConfig.