From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 1 May 2022 11:05:39 +0000 (+0100)
Subject: Merge branch '2.6.x'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb/commitdiff_plain/76b4a2c01d4c791f7260cf73b1c88e05aeeaaf6a?ds=sidebyside

Merge branch '2.6.x'

* 2.6.x:
  progs/key.c, progs/key.1: Fix option discrepancies.
---

76b4a2c01d4c791f7260cf73b1c88e05aeeaaf6a