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: v0.6.0~250^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=2a8a5a4b83fa745c7016a68dad7722aed4709705

Merge from secnet
---

2a8a5a4b83fa745c7016a68dad7722aed4709705