merge

diff --cc src/cadet/cadet_api.c
Simple merge

diff --cc src/set/gnunet-service-set_union.c
index 8c0c52d643507c1ca84b577838f13deb1cf0e532,c1268948a3dcadeeb78f27693f08dd48705715d9..73d3f5c83f1d330b52f79d3745721e0f64f23c8b
--- 1/src/set/gnunet-service-set_union.c
--- 2/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@@ -1379,7 -1399,7 +1399,8 @@@ send_client_done (void *cls
    struct GNUNET_MQ_Envelope *ev;
    struct GNUNET_SET_ResultMessage *rm;
  
--  if (GNUNET_YES == op->state->client_done_sent) {
++  if (GNUNET_YES == op->state->client_done_sent)
++  {
      return;
    }