[GNUnet-SVN] [gnunet] 27/28: Merge branch 'master' into getopt

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit c253a40bae417335fab8446f3c7182c8c5d4833f
Merge: 273188e64 79fb947eb
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Mar 17 11:53:24 2017 +0100

    Merge branch 'master' into getopt

 contrib/.gitignore                                 |   1 +
 po/POTFILES.in                                     |   7 +-
 src/cadet/Makefile.am                              |   2 +-
 src/consensus/consensus_protocol.h                 |   6 +-
 src/conversation/gnunet-helper-audio-playback.c    |  15 +-
 src/conversation/microphone.c                      |   2 -
 src/core/gnunet-service-core_kx.c                  | 152 ++--
 src/dns/gnunet-service-dns.c                       |   3 +-
 src/exit/gnunet-daemon-exit.c                      |   2 -
 src/fs/fs_dirmetascan.c                            |   2 -
 src/include/Makefile.am                            |   2 -
 src/include/gnunet_connection_lib.h                | 400 ----------
 src/include/gnunet_helper_lib.h                    |   8 +-
 src/include/gnunet_mq_lib.h                        |   1 +
 src/include/gnunet_server_lib.h                    | 887 ---------------------
 src/include/gnunet_service_lib.h                   |  61 +-
 src/include/gnunet_util_lib.h                      |   2 -
 src/multicast/.gitignore                           |   1 +
 src/nat-auto/Makefile.am                           |   5 +-
 src/nat-auto/gnunet-nat-server.c                   | 212 ++---
 src/psyc/.gitignore                                |   1 +
 src/psycstore/.gitignore                           |   4 +
 src/psycutil/.gitignore                            |   1 +
 src/regex/gnunet-service-regex.c                   | 321 ++++----
 src/social/.gitignore                              |   1 +
 src/testbed-logger/gnunet-service-testbed-logger.c | 179 ++---
 src/testbed-logger/test_testbed_logger_api.c       |   4 +
 src/testbed/testbed_api_hosts.c                    |   5 +-
 src/transport/Makefile.am                          |   4 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |  30 +-
 src/transport/plugin_transport_http_client.c       |  21 +-
 src/transport/plugin_transport_http_server.c       |  23 +-
 src/transport/plugin_transport_tcp.c               | 528 +++++++++++-
 src/transport/plugin_transport_udp.c               |  39 +-
 src/transport/plugin_transport_udp.h               |  12 +-
 src/transport/plugin_transport_udp_broadcasting.c  |  30 +-
 src/transport/plugin_transport_wlan.c              |  29 +-
 .../tcp_connection_legacy.c}                       |   1 -
 .../server.c => transport/tcp_server_legacy.c}     |   4 -
 src/transport/tcp_server_mst_legacy.c              | 311 ++++++++
 .../service.c => transport/tcp_service_legacy.c}   |  10 -
 src/transport/test_plugin_transport.c              |   2 +-
 src/util/Makefile.am                               |  92 +--
 src/util/helper.c                                  |  23 +-
 src/util/mq.c                                      | 104 ---
 src/util/test_connection.c                         | 167 ----
 src/util/test_connection_addressing.c              | 186 -----
 src/util/test_connection_receive_cancel.c          | 160 ----
 src/util/test_connection_timeout.c                 | 129 ---
 src/util/test_connection_timeout_no_connect.c      |  76 --
 src/util/test_connection_transmit_cancel.c         |  76 --
 src/util/test_server.c                             | 302 -------
 src/util/test_server_disconnect.c                  | 166 ----
 src/util/test_server_mst_interrupt.c               |  60 --
 src/util/test_server_with_client.c                 | 198 -----
 src/util/test_server_with_client_unix.c            | 176 ----
 src/vpn/gnunet-service-vpn.c                       |   2 -
 57 files changed, 1375 insertions(+), 3873 deletions(-)


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