[gnunet] 02/06: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

t3sserakt pushed a commit to branch master
in repository gnunet.

commit 38193fe48a572e475b4f84717ff5b3edbcaf2d2a
Merge: 33954ae13 6ab14a206
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Thu Aug 6 16:25:51 2020 +0200

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

 contrib/Makefile.inc                     |   6 -
 po/POTFILES.in                           |  98 ++--
 src/gns/plugin_rest_gns.c                |  65 +--
 src/identity/plugin_rest_identity.c      | 290 +++++------
 src/include/gnunet_buffer_lib.h          |   6 +-
 src/include/gnunet_rest_plugin.h         |   8 +-
 src/include/gnunet_strings_lib.h         |  24 +
 src/namestore/namestore_api.c            |   2 +
 src/namestore/plugin_rest_namestore.c    | 242 ++++-----
 src/peerinfo-tool/plugin_rest_peerinfo.c |  66 +--
 src/reclaim/gnunet-service-reclaim.c     |   4 +-
 src/reclaim/oidc_helper.c                | 532 +++++++++++---------
 src/reclaim/oidc_helper.h                |  39 +-
 src/reclaim/plugin_rest_openid_connect.c | 823 ++++++++++++++++++-------------
 src/reclaim/plugin_rest_reclaim.c        | 296 +++++------
 src/reclaim/reclaim_api.c                |   2 +
 src/rest/gnunet-rest-server.c            | 379 ++++++++++----
 src/rest/plugin_rest_config.c            |   7 +-
 src/rest/plugin_rest_copying.c           |  32 +-
 src/transport/transport-testing2.c       |   9 -
 src/util/buffer.c                        |  21 +-
 src/util/strings.c                       | 158 ++++++
 src/util/test_strings.c                  |  14 +
 23 files changed, 1828 insertions(+), 1295 deletions(-)

diff --cc src/transport/transport-testing2.c
index 0c85660dd,13944e9f0..e194b0159
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@@ -1023,12 -1026,10 +1023,8 @@@ peerstore_start 
  {
    char *binary;
  
--  LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start\n");
    binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore");
-   LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start binary %s\n",
-        binary);
-   LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start 2\n");
 -  tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_USE_PIPE_CONTROL
 -                                           | 
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
 +  tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                             NULL,
                                             NULL,
                                             NULL,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.