From: Mark Wooding Date: Tue, 8 Oct 2019 10:45:56 +0000 (+0100) Subject: Merge branch '2.4.x' into 2.5.x X-Git-Tag: 2.5.2~9 X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/e2f967aeff8b2c0b42d0b0a209f47543d61e48b1 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. --- e2f967aeff8b2c0b42d0b0a209f47543d61e48b1