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

[gnunet]

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

xrs pushed a commit to branch master
in repository gnunet.

commit ec3b834e1a8a8ce93f10221952b595d05e2c72a3
Merge: d25f1b402 35e5be0b0
Author: xrs <address@hidden>
AuthorDate: Fri Nov 16 18:22:09 2018 +0100

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

 configure.ac                                       |  151 +--
 doc/handbook/chapters/installation.texi            |   44 +-
 doc/handbook/chapters/user.texi                    |   27 +-
 doc/man/gnunet-namestore.1                         |    8 +
 po/POTFILES.in                                     |    4 +
 po/de.po                                           |    2 +-
 po/sv.po                                           |    2 +-
 po/vi.po                                           |    2 +-
 po/zh_CN.po                                        |    2 +-
 src/cadet/gnunet-service-cadet_paths.c             |    6 +-
 src/cadet/gnunet-service-cadet_tunnels.c           |    2 +-
 src/cadet/test_cadet.conf                          |    4 +
 src/dht/gnunet-dht-get.c                           |    2 +-
 src/dht/gnunet-service-dht_clients.c               |    2 +-
 src/fs/fs_getopt.c                                 |   29 +-
 src/fs/gnunet-publish.c                            |   60 +-
 src/fs/gnunet-search.c                             |   49 +-
 src/fs/gnunet-service-fs.c                         |    2 +-
 src/gns/gnunet-gns-proxy.c                         |   48 +-
 src/gns/test_gns_cname_lookup.sh                   |    3 +
 src/gns/test_gns_defaults.conf                     |   12 +
 src/gns/test_gns_gns2dns_cname_lookup.sh           |    9 +-
 src/gns/test_gns_gns2dns_lookup.sh                 |   10 +-
 src/gns/test_gns_mx_lookup.sh                      |    4 +
 src/gnsrecord/gnsrecord.c                          |    3 -
 src/include/gnunet_bandwidth_lib.h                 |    2 +-
 src/include/gnunet_configuration_lib.h             |   31 +-
 src/include/gnunet_consensus_service.h             |    2 +-
 src/include/gnunet_protocols.h                     |   44 +-
 src/include/gnunet_testbed_service.h               |    4 +-
 .../gnunet_transport_communication_service.h       |   10 +-
 src/include/gnunet_transport_core_service.h        |   12 +-
 src/include/gnunet_transport_monitor_service.h     |   18 +-
 src/my/my.c                                        |    2 +-
 src/namestore/gnunet-namestore.c                   |  375 +++++-
 src/namestore/gnunet-zoneimport.c                  |    2 +-
 src/namestore/namestore_api.c                      |    2 +-
 src/namestore/test_namestore_put_multiple.sh       |  123 ++
 src/testbed/testbed.h                              |    2 +-
 src/testbed/testbed_api_hosts.c                    |    2 +-
 src/topology/gnunet-daemon-topology.c              |    3 +-
 src/transport/.gitignore                           |    1 +
 src/transport/Makefile.am                          |   56 +-
 src/transport/communicator-unix.conf               |    2 +
 src/transport/gnunet-communicator-unix.c           | 1147 ++++++++++++++++++
 src/transport/gnunet-service-tng.c                 | 1263 ++++++++++++++++++++
 src/transport/gnunet-service-transport.c           |    1 -
 .../gnunet-service-transport_neighbours.c          |    3 +-
 src/transport/gnunet-transport.c                   |    2 +-
 src/transport/transport-testing.c                  |    4 +-
 src/transport/transport-testing.h                  |    8 +-
 src/transport/transport.h                          |  161 ++-
 src/transport/transport_api2_communication.c       |  194 +--
 ...{transport_api_core.c => transport_api2_core.c} |  128 +-
 src/transport/transport_api2_monitor.c             |  313 +++++
 src/transport/transport_api_core.c                 |   17 +-
 src/util/configuration.c                           |   62 +-
 src/util/disk.c                                    |   51 +-
 src/util/getopt.c                                  |    8 +-
 src/util/getopt_helpers.c                          |   25 +-
 src/util/gnunet-service-resolver.c                 |   18 +-
 src/util/service.c                                 |   18 +-
 src/util/strings.c                                 |   43 +-
 63 files changed, 4093 insertions(+), 553 deletions(-)

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