Merge branch '2.4.x' into 2.5.x
authorMark Wooding <mdw@distorted.org.uk>
Tue, 8 Oct 2019 10:45:56 +0000 (11:45 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 8 Oct 2019 10:45:56 +0000 (11:45 +0100)
commite2f967aeff8b2c0b42d0b0a209f47543d61e48b1
tree2dd05de31cbdbf39d95510bc36db69a6fbe789bc
parent2eed595914ae2ec6f26832d9c55c226220a8c6b5
parent710440c8a83df5949e6ed5f4085717dfab5c4877
Merge branch '2.4.x' into 2.5.x

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