[GNUnet-SVN] [gnunet] 05/05: 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 a40c86500c64edc047dbe2e3019a71e2f72b6633
Merge: 8682c673e 2e86e3173
Author: Nils Gillmann <address@hidden>
AuthorDate: Wed May 2 07:59:41 2018 +0000

    Merge branch 'master' of gnunet.org:gnunet

 .gitignore                                         |    3 +
 contrib/timeout_watchdog.c                         |    7 +-
 doc/documentation/chapters/installation.texi       |   47 +-
 doc/man/Makefile.am                                |    4 +-
 doc/man/gnunet-fs.1                                |    7 +-
 doc/man/gnunet-gns-import.1                        |   17 -
 doc/man/gnunet-namestore-fcfsd.1                   |    2 +-
 doc/man/gnunet-zoneimport.1                        |   47 +
 src/credential/gnunet-service-credential.c         |    4 +-
 src/dht/dht.h                                      |   29 -
 src/dht/dht_api.c                                  |   55 +-
 src/dht/dht_test_lib.c                             |   14 +-
 src/dht/gnunet-dht-put.c                           |   81 +-
 src/dht/gnunet-service-dht_clients.c               |    8 -
 src/dht/test_dht_api.c                             |    4 +-
 src/dht/test_dht_topo.c                            |    9 +-
 src/dns/dnsstub.c                                  |  683 ++++++------
 src/dns/gnunet-service-dns.c                       |   43 +-
 src/dns/gnunet-zoneimport.c                        |   24 +-
 src/exit/gnunet-daemon-exit.c                      |   42 +-
 src/fs/gnunet-service-fs_put.c                     |    7 +-
 src/gns/gns.conf.in                                |    3 -
 src/gns/gns_tld_api.c                              |   14 +-
 src/gns/gnunet-dns2gns.c                           |   19 +-
 src/gns/gnunet-gns-proxy.c                         |   14 +-
 src/gns/gnunet-service-gns.c                       |   10 +-
 src/gns/gnunet-service-gns_resolver.c              | 1099 +++++++++++---------
 src/gns/test_gns_lookup.conf                       |    2 +-
 src/gnsrecord/gnsrecord_crypto.c                   |  177 +++-
 src/gnsrecord/gnsrecord_misc.c                     |   18 +-
 src/gnsrecord/test_gnsrecord_crypto.c              |   79 +-
 .../gnunet-service-identity-provider.c             |   21 +-
 src/identity-provider/plugin_rest_openid_connect.c |    7 +-
 src/include/gnunet_dht_service.h                   |   18 +-
 src/include/gnunet_dnsstub_lib.h                   |   85 +-
 src/include/gnunet_gns_service.h                   |    9 +-
 src/include/gnunet_gnsrecord_lib.h                 |   26 +-
 src/include/gnunet_namestore_plugin.h              |   16 +-
 src/include/gnunet_namestore_service.h             |    5 +-
 src/include/gnunet_protocols.h                     |    5 -
 src/namecache/namecache.conf.in                    |    5 +
 src/namecache/plugin_namecache_sqlite.c            |   75 +-
 src/namestore/.gitignore                           |   48 +
 src/namestore/Makefile.am                          |  466 +++++++--
 src/namestore/gnunet-namestore-fcfsd.c             |   21 +-
 src/namestore/gnunet-namestore.c                   |   14 +-
 src/namestore/gnunet-service-namestore.c           |  372 ++++---
 src/namestore/gnunet-zoneimport.c                  |  977 +++++++++++++----
 src/namestore/namestore.conf.in                    |   11 +-
 src/namestore/namestore.h                          |   12 +-
 src/namestore/namestore_api.c                      |   11 +-
 src/namestore/perf_namestore_api_flat.conf         |    7 +
 src/namestore/perf_namestore_api_postgres.conf     |    7 +
 src/namestore/perf_namestore_api_sqlite.conf       |    4 +
 src/namestore/perf_namestore_api_zone_iteration.c  |  388 +++++++
 src/namestore/plugin_namestore_flat.c              |  192 ++--
 src/namestore/plugin_namestore_postgres.c          |  133 ++-
 src/namestore/plugin_namestore_sqlite.c            |  283 ++---
 src/namestore/plugin_rest_namestore.c              |    8 +-
 src/namestore/test_namestore_api.conf              |   11 +
 src/namestore/test_namestore_api_flat.conf         |    4 +
 src/namestore/test_namestore_api_lookup_nick.c     |   16 +-
 src/namestore/test_namestore_api_lookup_private.c  |   14 +-
 src/namestore/test_namestore_api_lookup_public.c   |   10 +-
 src/namestore/test_namestore_api_lookup_shadow.c   |   16 +-
 .../test_namestore_api_lookup_shadow_filter.c      |   12 +-
 src/namestore/test_namestore_api_monitoring.c      |   34 +-
 .../test_namestore_api_monitoring_existing.c       |   41 +-
 src/namestore/test_namestore_api_postgres.conf     |    4 +
 src/namestore/test_namestore_api_remove.c          |   30 +-
 ...test_namestore_api_remove_not_existing_record.c |   12 +-
 src/namestore/test_namestore_api_sqlite.conf       |    4 +
 src/namestore/test_namestore_api_store.c           |   10 +-
 src/namestore/test_namestore_api_store_update.c    |   10 +-
 src/namestore/test_namestore_api_zone_iteration.c  |   13 +-
 .../test_namestore_api_zone_iteration_nick.c       |   15 +-
 ...st_namestore_api_zone_iteration_specific_zone.c |   15 +-
 .../test_namestore_api_zone_iteration_stop.c       |   13 +-
 src/namestore/test_namestore_api_zone_to_name.c    |   17 +-
 src/namestore/test_plugin_namestore.c              |  100 +-
 src/util/container_multihashmap.c                  |   55 +-
 src/util/mq.c                                      |    8 +-
 src/util/resolver_api.c                            |   10 +-
 src/zonemaster/gnunet-service-zonemaster.c         |  608 ++++++++---
 84 files changed, 4711 insertions(+), 2169 deletions(-)

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