Merge branch 'master' of git+ssh://gnunet.org/gnunet

diff --git a/contrib/apparmor/gnunet-mesh b/contrib/apparmor/gnunet-mesh
deleted file mode 100644 (file)
index 9f5b07f..0000000
--- a/contrib/apparmor/gnunet-mesh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Last Modified: Fri Aug  7 18:02:28 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/bin/gnunet-mesh {
-  #include <abstractions/base>
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/bin/gnunet-mesh mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/gnunet>
-}

diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index d85885d64f77274dcd9b81855393c5fb6d66443f..79108ff2d579ffb502431ca4db95f9ed19f9a7f7 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1246,7 +1246,7 @@ shutdown_task (void *cls)
   while (NULL != hosts_head)
     free_hosts_entry (hosts_head);
   GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free (my_domain);
+  GNUNET_free_non_null (my_domain);
 }