[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit 2e365a70397a23581dd1c8165f64ea68e2ac250b
Merge: 630bd4740 0d128388d
Author: Nils Gillmann <address@hidden>
AuthorDate: Wed Jul 4 08:26:52 2018 +0000

    Merge branch 'master' of gnunet.org:gnunet

 po/POTFILES.in                                     | 127 +++++++++++----------
 src/arm/test_exponential_backoff.c                 |   3 +
 src/cadet/cadet_api.c                              |   1 +
 .../gnunet-service-identity-provider.c             |  46 ++++----
 src/identity-provider/identity_provider_api.c      |  11 +-
 .../plugin_rest_identity_provider.c                |   2 +-
 src/identity-provider/plugin_rest_openid_connect.c |  15 ++-
 src/multicast/test_multicast_multipeer.c           |   2 +
 src/rps/gnunet-rps-profiler.c                      |   4 +-
 src/rps/gnunet-service-rps.c                       |  60 +++-------
 src/rps/rps-test_util.c                            |  80 ++++++++++++-
 11 files changed, 208 insertions(+), 143 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden