From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 8 Oct 2019 10:48:32 +0000 (+0100)
Subject: Merge branch '2.5.x'
X-Git-Tag: 2.6.0~55
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/7875ad25119a0099dfcfba3fbd256e404c722ff3

Merge branch '2.5.x'

* 2.5.x:
  key/key-io.c: Mark `exptime' function `static'.
  key/key-io.c (key_new): Don't leak attribute `sym_table' on error.
---

7875ad25119a0099dfcfba3fbd256e404c722ff3