chiark / gitweb /
~mdw / catacomb / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 799e63b 075439a)
Merge branch '2.6.x'
authorMark Wooding <mdw@distorted.org.uk>
Sun, 1 May 2022 11:05:39 +0000 (12:05 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 1 May 2022 11:05:39 +0000 (12:05 +0100)
* 2.6.x:
  progs/key.c, progs/key.1: Fix option discrepancies.


Trivial merge
Catacomb cryptographic library