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)
* 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.

1  2 
debian/catacomb2.symbols

Simple merge