Merge remote-tracking branch 'origin/master' into credentials

diff --combined src/exit/gnunet-daemon-exit.c
index 87b30c04a97c5df2a6c21549d0e289689b70f920,7196a18446d121ad43fba3abb0b52b0d1b59928b..d9a5dd6848a0596723a485e4694fa7b629408ff2
--- 1/src/exit/gnunet-daemon-exit.c
--- 2/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@@ -3802,7 -3802,7 +3802,7 @@@ run (void *cls
      if (GNUNET_YES !=
        GNUNET_OS_check_helper_binary (binary,
                                         GNUNET_YES,
 -                                       "-d gnunet-vpn - - - 169.1.3.3.7 255.255.255.0")) //no nat, ipv4 only
 +                                       "gnunet-vpn - - - 169.1.3.7 255.255.255.0")) //no nat, ipv4 only
      {
        GNUNET_free (binary);
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@@ -3852,7 -3852,8 +3852,8 @@@
  
    /* Cadet handle acquired, now open ports and announce regular
       expressions matching our exit */
-   if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) )
+   if ( (GNUNET_YES == ipv4_enabled) &&
+        (GNUNET_YES == ipv4_exit) )
    {
      GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_IPV4_GATEWAY,
                          strlen (GNUNET_APPLICATION_PORT_IPV4_GATEWAY),
@@@ -3931,12 -3932,12 +3932,12 @@@
        GNUNET_free (prefixed_regex);
      }
    }
-   if ((ipv4_exit) || (ipv6_exit))
-     helper_handle = GNUNET_HELPER_start (GNUNET_NO,
-                                        "gnunet-helper-exit",
-                                        exit_argv,
-                                        &message_token,
-                                        NULL, NULL);
+   helper_handle = GNUNET_HELPER_start (GNUNET_NO,
+                                      "gnunet-helper-exit",
+                                      exit_argv,
+                                      &message_token,
+                                      NULL,
+                                      NULL);
  }