[GNUnet-SVN] [gnunet] 35/45: -merge branch 'master' into identity_oidc

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit a67bd3630046d3a52195a13cbd4b4631c283d68d
Merge: 5cc1e5ae9 e22c9d7e5
Author: Phil <address@hidden>
AuthorDate: Mon Jan 22 14:56:59 2018 +0100

    -merge branch 'master' into identity_oidc

 .gitignore                                         |   5 +
 Makefile.am                                        |   6 +-
 README                                             |   5 +-
 configure.ac                                       |  20 +-
 contrib/ssh-keys                                   |   2 +
 doc/Makefile.am                                    |   7 +-
 doc/documentation/chapters/developer.texi          |   2 +-
 guix-env.scm                                       |   3 +-
 src/cadet/cadet_api.c                              |  10 +-
 src/cadet/gnunet-service-cadet.c                   |   9 +-
 src/cadet/gnunet-service-cadet_paths.c             |  12 +-
 src/datastore/plugin_datastore_sqlite.c            |  82 ++++-
 src/dht/Makefile.am                                |   1 +
 src/dht/gnunet-dht-get.c                           |  39 +--
 src/dht/test_dht_tools.conf                        | 157 +++++++++
 src/dht/test_dht_tools.sh                          |  21 +-
 src/fs/gnunet-publish.c                            |  57 ++-
 src/gns/gnunet-gns-proxy.c                         |   4 +-
 src/identity-provider/identity_provider_api.c      |  22 +-
 src/include/gnunet_namestore_service.h             |   2 +-
 src/multicast/Makefile.am                          |   8 -
 src/multicast/test_multicast_multipeer.c           |  26 +-
 src/namestore/Makefile.am                          |  16 +-
 src/namestore/namestore_api.c                      |  20 +-
 src/namestore/plugin_namestore_sqlite.c            |   2 +-
 src/namestore/test_namestore_api_zone_to_name.c    | 212 ++++++-----
 src/pq/pq_result_helper.c                          |  36 +-
 src/psyc/Makefile.am                               |  12 +-
 src/psyc/psyc_test_lib.h                           |  67 ++++
 src/psyc/test_psyc.conf                            |  30 +-
 src/psyc/test_psyc2.c                              | 284 +++++++++++++++
 src/psyc/test_psyc_api_join.c                      | 282 +++++++++++++++
 src/psycutil/psyc_message.c                        |   1 -
 src/rps/Makefile.am                                |   4 +-
 src/rps/gnunet-service-rps.c                       |  44 ++-
 src/rps/test_rps.c                                 | 387 ++++++++++++++++++++-
 src/topology/friends.c                             |  39 ++-
 .../gnunet-service-transport_neighbours.c          |  10 +
 src/transport/test_quota_compliance.c              |   6 +-
 src/util/container_bloomfilter.c                   |   2 +-
 src/util/scheduler.c                               | 161 +++++----
 src/util/test_scheduler.c                          |  49 ++-
 42 files changed, 1808 insertions(+), 356 deletions(-)

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