simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  359b5c8 Merge the 0.68 release branchlet to master.
  0415af2 Release-procedure stuff: remove outdated hostname 'atreus'.

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:           2017-02-21 18:53:47

commit 359b5c8eb45ff56c62032cf147fcdb3723d54324
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=359b5c8eb45ff56c62032cf147fcdb3723d54324;hp=7705fc4470b76ec7979dc00e5c97efd720d5e335
Merge: 7705fc4 23fbc4f
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Feb 20 20:52:41 2017 +0000

    Merge the 0.68 release branchlet to master.
    
    Conflicts in the FAQ are fixed by incorporating Jacob's rewritten
    post-0.68 version. (But owing to considerable git confusion I haven't
    managed to get his name on to this commit anywhere.)

commit 0415af2ee7154de8d8ffa2828ff8faf69e8780dc
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=0415af2ee7154de8d8ffa2828ff8faf69e8780dc;hp=359b5c8eb45ff56c62032cf147fcdb3723d54324
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Feb 21 18:36:29 2017 +0000

    Release-procedure stuff: remove outdated hostname 'atreus'.
    
    The main tartarus.org host has changed since the last release, so we
    now have to upload things to somewhere different. Updated the release
    automation in release.pl, and all the mentions of atreus in the manual
    checklist too.

 CHECKLST.txt | 8 ++++----
 release.pl   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)