Merge commit 'meins/next' into next

diff --combined command.c
index a9eb03f17e32e35d361baa68db1f532872b35be6,afa1e667ca3bfdfedfd17e7de6be622f210ec383..8fdb839a97be1e6c459f5911621fffa88d61410b
--- 1/command.c
--- 2/command.c
+++ b/command.c
@@@ -6,6 -6,7 +6,7 @@@
  
  /** \file command.c Client authentication and server commands. */
  
+ #include <regex.h>
  #include <signal.h>
  #include <sys/time.h>
  #include <sys/types.h>
@@@ -777,7 -778,7 +778,7 @@@ __noreturn void handle_connect(int fd, 
                numbytes = 256;
                get_random_bytes_or_die((unsigned char *)buf, numbytes);
        }
 -      PARA_DEBUG_LOG("sending %zu byte challenge + rc4 keys (%u bytes)\n",
 +      PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
                CHALLENGE_SIZE, numbytes);
        ret = send_bin_buffer(fd, buf, numbytes);
        if (ret < 0)
@@@ -787,7 -788,7 +788,7 @@@
        if (ret < 0)
                goto net_err;
        numbytes = ret;
 -      PARA_DEBUG_LOG("received %zu bytes challenge response\n", ret);
 +      PARA_DEBUG_LOG("received %d bytes challenge response\n", ret);
        ret = -E_BAD_USER;
        if (!u)
                goto net_err;