Merge remote branch 'origin/testing' into unstable

diff --cc src/config.cc
Simple merge

diff --cc src/config.h
Simple merge

diff --cc src/msg/SimpleMessenger.cc
Simple merge

diff --cc src/msg/SimpleMessenger.h
Simple merge

diff --cc src/msg/tcp.cc
index f67db85079543cab6457e4eef18a2ddaf3370f3a,0e08a694de691230e8da05617bc0d0770caf10ac..c1be7567fc084b3c383015ed27ab82c7eb6c8c44
--- 1/src/msg/tcp.cc
--- 2/src/msg/tcp.cc
+++ b/src/msg/tcp.cc
@@@ -7,10 -8,11 +8,11 @@@
  /******************
   * tcp crap
   */
 -
 -int tcp_read(int sd, char *buf, int len, int timeout) {
 +int tcp_read(int sd, char *buf, int len, int timeout) 
 +{
    if (sd < 0)
      return -1;
+ 
    struct pollfd pfd;
    pfd.fd = sd;
    pfd.events = POLLIN | POLLHUP | POLLRDHUP | POLLNVAL | POLLERR;