From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 25 Nov 2019 13:35:00 +0000 (+0000)
Subject: Merge commit '0428556765a15326025e9fe4809936c6cafd3c85'
X-Git-Tag: v0.6.0~268
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=4ab0e4ad32e169bfd9e3af465e5850ccb8520890

Merge commit '0428556765a15326025e9fe4809936c6cafd3c85'
---

4ab0e4ad32e169bfd9e3af465e5850ccb8520890