From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Dec 2019 22:18:19 +0000 (+0000)
Subject: Merge from secnet
X-Git-Tag: subdirmk/0.3~123
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=2a8a5a4b83fa745c7016a68dad7722aed4709705

Merge from secnet
---

2a8a5a4b83fa745c7016a68dad7722aed4709705