Merge commit 'ef456118' into thread-next

diff --cc proto/rpki/packets.c
index 4cd10773c7624d0b569f056f1bc27900f28bcb96,bbef16ef52cfcf82d50296441cd51b7307e0dd38..15ab47220615ef64418abe768dca2ecc6ead9f40
--- 1/proto/rpki/packets.c
--- 2/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@@ -1135,7 -1162,7 +1156,7 @@@ rpki_connected_hook(sock *sk
   * This function prepares Error PDU and sends it to a cache server.
   */
  static int
- rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
 -rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_code, u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
++rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
  {
    va_list args;
    char msg[128];