[GNUnet-SVN] [gnunet] 05/75: -merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

[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 bd01c63635f13a47bc295255e9485b785921f797
Merge: 4ab30f893 324f6168c
Author: Phil <address@hidden>
AuthorDate: Mon Jun 4 23:50:13 2018 +0200

    -merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

 contrib/Makefile.am                                |    3 +-
 po/de.po                                           | 2720 +++++++------
 po/es.po                                           | 2789 ++++++-------
 po/fr.po                                           | 2649 +++++++------
 po/sv.po                                           | 2821 +++++++-------
 po/vi.po                                           | 2839 +++++++-------
 po/zh_CN.po                                        | 2655 +++++++------
 src/core/gnunet-service-core_kx.c                  |  240 +-
 src/datacache/datacache.c                          |    3 +
 src/datacache/plugin_datacache_heap.c              |  143 +-
 src/datacache/plugin_datacache_postgres.c          |    2 +
 src/datacache/plugin_datacache_sqlite.c            |   94 +-
 src/datacache/plugin_datacache_template.c          |    2 +
 src/datacache/test_datacache.c                     |   10 +-
 src/datacache/test_datacache_quota.c               |   31 +-
 src/dht/gnunet-dht-get.c                           |   22 +-
 src/dht/gnunet-dht-monitor.c                       |   27 +-
 src/dht/gnunet-service-dht_datacache.c             |    6 +-
 src/dht/gnunet-service-dht_neighbours.c            |   14 +-
 src/dht/gnunet-service-dht_neighbours.h            |   22 +
 src/gns/gnunet-bcd.c                               |   22 +-
 src/gns/gnunet-gns-proxy.c                         |   16 +-
 src/gns/gnunet-service-gns_resolver.c              |    2 +-
 src/hostlist/gnunet-daemon-hostlist_client.c       |   65 +-
 src/include/gnunet_core_service.h                  |    2 +-
 src/include/gnunet_datacache_lib.h                 |    2 +
 src/include/gnunet_datacache_plugin.h              |    2 +
 src/include/gnunet_getopt_lib.h                    |   17 +
 src/include/gnunet_protocols.h                     |    6 +
 src/peerinfo/peerinfo_api.c                        |    3 +
 src/topology/gnunet-daemon-topology.c              |   31 +-
 src/transport/Makefile.am                          |   33 +-
 .../gnunet-service-transport_validation.c          |   13 +-
 src/transport/plugin_transport_xt.c                | 4107 ++++++++++++++++++++
 src/transport/plugin_transport_xu.c                | 2492 ++++++++++++
 src/transport/plugin_transport_xu.h                |  273 ++
 src/transport/transport.conf.in                    |   37 +
 src/util/getopt_helpers.c                          |   76 +
 38 files changed, 16302 insertions(+), 7989 deletions(-)

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