simon-git: putty (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  f0265167 Release checklist updates in the wake of 0.80.
  b8461784 Fix mis-merges from the 0.80 branch.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2023-12-19 08:11:51

commit f0265167b1fade0bef7d863b28df4dc279f82296
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=f0265167b1fade0bef7d863b28df4dc279f82296;hp=968ac6dbf0806e0c56a1cde7f74c25e1f150e5ed
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Dec 19 07:00:04 2023 +0000

    Release checklist updates in the wake of 0.80.
    
    'Merge the release branch to main' shouldn't be half way down the
    procedure of actually _doing_ the release. Sometimes it's not trivial!
    This time, for example, major changes in windows/console.c had taken
    place on main (the ConsoleIO abstraction) which conflicted with also-
    major changes on the release branch (the rework of the weak-crypto
    warning messages to use SeatDialogText, for the Terrapin warning).
    Suddenly I realise it makes more sense to prepare the merge in
    advance, and then if it's difficult you get time to think about that
    and solve it at leisure.
    
    Also, I'm on Mastodon these days, and that seems like an obviously
    useful place to announce releases. Added a checklist item to draft a
    release toot, and another one to send it.
    
    Lastly, I managed to miss my own suggested template wording for MS
    Store 'what's new' text, even though it was right there in the
    checklist! Expanded it out into a display paragraph or two, so that
    it's more obvious.

 CHECKLST.txt | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

commit b846178443cf1a5dc7c5ea2079fd34fd465af497
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=b846178443cf1a5dc7c5ea2079fd34fd465af497;hp=f0265167b1fade0bef7d863b28df4dc279f82296
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Dec 19 07:06:21 2023 +0000

    Fix mis-merges from the 0.80 branch.
    
    As I mentioned in the previous commit, this merge was nontrivial
    enough that it wasn't a good idea for the release checklist to suggest
    doing it in a hurry. And indeed, now I look at it again this morning,
    there are mistakes: a memory leak of ConsoleIO on the abort path from
    both affected functions, and a missing space in one of the prompt
    messages. Now both fixed.

 windows/console.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)