Merge branch 'master' into cadet_option

diff --cc src/cadet/cadet_api.c
index 8638be27dcdf7dc8c467292e50eddc3ab238526b,e141787a0229ab459388dbeda09ffdbca175d297..b16520429d9e5587f81cf948d080bbec8b08881f
--- 1/src/cadet/cadet_api.c
--- 2/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@@ -583,10 -575,10 +570,9 @@@ handle_channel_created 
      return;
    }
  
-   ch = create_channel (h,
-                        &ccn);
+   ch = create_channel (h, &ccn);
    ch->peer = msg->peer;
    ch->incoming_port = port;
 -  ch->options = ntohl (msg->opt);
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Creating incoming channel %X [%s] %p\n",
         ntohl (ccn.channel_of_client),
@@@ -1124,13 -1100,13 +1073,12 @@@ GNUNET_CADET_channel_create (struct GNU
  
    GNUNET_assert (NULL != disconnects);
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Creating channel to peer %s at port %s\n",
-             GNUNET_i2s (destination),
-             GNUNET_h2s (port));
-   ch = create_channel (h,
-                        NULL);
+               "Creating channel to peer %s at port %s\n",
+               GNUNET_i2s (destination),
+               GNUNET_h2s (port));
+   ch = create_channel (h, NULL);
    ch->ctx = channel_cls;
    ch->peer = *destination;
 -  ch->options = options;
    ch->window_changes = window_changes;
    ch->disconnects = disconnects;
  
@@@ -1151,8 -1125,8 +1097,7 @@@
    msg->ccn = ch->ccn;
    msg->port = *port;
    msg->peer = *destination;
-   GNUNET_MQ_send (h->mq,
-                   env);
 -  msg->opt = htonl (options);
+   GNUNET_MQ_send (h->mq, env);
    return ch;
  }