Merge branch 'channel_destroy' of ssh://git.gnunet.org/gnunet into channel_destroy

diff --cc src/cadet/test_cadet.c
index bfad940c2c9bcf3310d6925b893ed9b36cbe3963,3e7dcbb0aca1a5a5931ad49131cbd8f54c76abf4..ceef37914fec7159bc470aa660d6154b0b5dd9d6
--- 1/src/cadet/test_cadet.c
--- 2/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@@ -967,10 -979,9 +979,11 @@@ connect_handler (void *cls
                channel);
    ok++;
    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-               " ok: (%d\n",
 -              " ok: %d\n",
 -              ok);
++              " ok: (%d/%d)\n",
 +              ok,
 +              ok_goal);
-   if (peer == peers_requested - 1)
++
+   if (peer == get_peer_nr())
    {
      if (NULL != incoming_ch)
      {