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)
commit7875ad25119a0099dfcfba3fbd256e404c722ff3
treebc22cf28b3b029f2943ddf2affdbb710a6d0ce5a
parentff56b2bb2cee5e08d6f2d5798af436de6c1ce6e9
parente2f967aeff8b2c0b42d0b0a209f47543d61e48b1
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.