[GNUnet-SVN] [gnunet] 167/171: -merge

[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 7c1f035ed971e12882cd7a65c7d36883842945b1
Merge: 92d8c8a77 61f532f18
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Jan 2 16:48:03 2018 +0100

    -merge

 Makefile.am                                        |    3 +-
 README.1st                                         |  245 +++
 configure.ac                                       |    6 +-
 contrib/packages/guix/gnunet-doc.scm               |    2 +-
 contrib/packages/guix/gnunet.scm                   |    2 +-
 contrib/packages/guix/guix-env.scm                 |    2 +-
 doc/Makefile.am                                    |    4 +-
 doc/documentation/.gitignore                       |    2 +
 doc/documentation/Makefile.am                      |   55 +-
 doc/documentation/chapters/contributing.texi       |   14 +-
 doc/documentation/chapters/developer.texi          |    2 +-
 doc/documentation/chapters/philosophy.texi         |  128 +-
 doc/documentation/gnunet.texi                      |   23 +-
 po/POTFILES.in                                     |    1 -
 po/de.po                                           | 1732 +++++++++----------
 po/es.po                                           | 1748 +++++++++----------
 po/fr.po                                           | 1611 ++++++++----------
 po/sv.po                                           | 1708 +++++++++----------
 po/vi.po                                           | 1694 +++++++++---------
 po/zh_CN.po                                        | 1612 ++++++++----------
 src/arm/gnunet-service-arm.c                       |    3 +-
 src/auction/Makefile.am                            |    5 +
 src/cadet/cadet_api.c                              |  124 +-
 src/cadet/cadet_test_lib.c                         |    1 +
 src/cadet/gnunet-cadet.c                           |    1 +
 src/cadet/gnunet-service-cadet_core.c              |   42 +-
 src/cadet/gnunet-service-cadet_paths.c             |  169 +-
 src/cadet/gnunet-service-cadet_peer.c              |   53 +-
 src/cadet/gnunet-service-cadet_tunnels.c           |    4 +-
 src/cadet/test_cadet.c                             |  133 +-
 .../gnunet-helper-audio-playback-gst.c             |    5 +
 src/conversation/gnunet-helper-audio-playback.c    |    5 +
 src/conversation/gnunet_gst.c                      |    5 +
 src/conversation/microphone.c                      |    4 +-
 src/core/gnunet-service-core.c                     |    3 +
 src/core/gnunet-service-core_kx.c                  |    5 +-
 src/core/gnunet-service-core_sessions.c            |   19 +-
 src/dht/Makefile.am                                |    1 +
 src/dht/gnunet-service-dht.c                       |    1 -
 src/fs/fs_dirmetascan.c                            |    3 +
 src/fs/test_fs_download_persistence.c              |    1 -
 src/fs/test_fs_publish_persistence.c               |    1 -
 src/hello/hello.c                                  |    7 +
 src/include/Makefile.am                            |    7 +
 src/include/gnunet_common.h                        |   15 +-
 src/include/gnunet_mst_lib.h                       |    4 +-
 src/include/gnunet_network_lib.h                   |    6 +-
 src/include/gnunet_protocols.h                     |   30 +-
 src/include/gnunet_rest_lib.h                      |    2 +-
 src/include/gnunet_scheduler_lib.h                 |   44 +-
 src/include/gnunet_service_lib.h                   |    7 +-
 src/jsonapi/Makefile.am                            |    2 +-
 src/multicast/Makefile.am                          |    2 +-
 src/multicast/gnunet-service-multicast.c           |  248 ++-
 src/multicast/multicast_api.c                      |   51 +-
 src/multicast/test_multicast_multipeer.c           |  312 ++--
 src/psyc/gnunet-service-psyc.c                     |  131 +-
 src/psyc/psyc_api.c                                |  103 +-
 src/psyc/test_psyc.c                               |   28 +-
 src/psyc/test_psyc.conf                            |   16 +
 src/psycstore/psycstore_api.c                      |   10 +-
 src/rest/Makefile.am                               |    2 +
 src/rps/.gitignore                                 |   12 +
 src/rps/Makefile.am                                |   15 +-
 src/rps/gnunet-service-rps.c                       | 1798 +++++++++++++++++++-
 src/rps/gnunet-service-rps_peers.c                 | 1694 ------------------
 src/rps/gnunet-service-rps_peers.h                 |  437 -----
 src/rps/rps.h                                      |   96 ++
 src/rps/test_rps.c                                 |   86 +-
 src/rps/test_rps.conf                              |   38 +-
 src/rps/test_service_rps_peers.c                   |  137 --
 src/set/Makefile.am                                |    2 +-
 src/set/gnunet-service-set_union.c                 |    4 +-
 src/social/gnunet-service-social.c                 |  774 +++++----
 src/social/gnunet-social.c                         |   26 +-
 src/social/social_api.c                            |  292 ++--
 src/social/test_social.c                           |  268 +--
 src/social/test_social.conf                        |   19 +
 src/statistics/gnunet-service-statistics.c         |    4 +-
 src/testbed/Makefile.am                            |    2 +-
 src/testbed/gnunet-daemon-testbed-underlay.c       |    6 +-
 src/testbed/gnunet-helper-testbed.c                |    7 +-
 src/testbed/gnunet-service-testbed_oc.c            |   15 +-
 src/testbed/gnunet-testbed-profiler.c              |   15 +-
 src/transport/Makefile.am                          |    9 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |    6 +
 src/transport/gnunet-service-transport.c           |    4 +-
 .../gnunet-service-transport_validation.c          |   13 +
 src/transport/plugin_transport_http_server.c       |    2 +-
 src/util/client.c                                  |   41 +-
 src/util/mq.c                                      |   22 +
 src/util/mst.c                                     |   27 +-
 src/util/network.c                                 |    6 +-
 src/util/program.c                                 |   12 +-
 src/util/scheduler.c                               | 1557 ++++++++++-------
 src/util/service.c                                 |   31 +-
 src/util/time.c                                    |    2 +-
 src/vpn/gnunet-service-vpn.c                       |    3 +
 98 files changed, 9877 insertions(+), 9814 deletions(-)


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