From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 01:42:11 +0000 (+0000)
Subject: Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk
X-Git-Tag: v0.5.1~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=6522f1c523c246d62441d717936704d7a7f1e979

Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk
---

6522f1c523c246d62441d717936704d7a7f1e979