Merge branch '2.5.x'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 8 Oct 2019 10:48:32 +0000 (11:48 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 8 Oct 2019 10:48:32 +0000 (11:48 +0100)
* 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.


Trivial merge