From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 9 Aug 2018 14:43:47 +0000 (+0200)
Subject: merge
X-Git-Tag: v0.11.0~322
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5b7ed686d4a6c4ecb8e0302a42e85bb9bff42cac;p=oweals%2Fgnunet.git

merge
---

5b7ed686d4a6c4ecb8e0302a42e85bb9bff42cac
diff --cc src/set/gnunet-service-set_union.c
index 8c0c52d64,c1268948a..73d3f5c83
--- a/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;
    }