From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 24 Nov 2019 22:08:45 +0000 (+0000)
Subject: Merge commit 'a1e52614e600bed8e51b461e6569f2cd263e82bb'
X-Git-Tag: v0.6.0~271
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=c2fe245748bf2110bc6acf823f266715b08707db

Merge commit 'a1e52614e600bed8e51b461e6569f2cd263e82bb'
---

c2fe245748bf2110bc6acf823f266715b08707db