[GNUnet-SVN] [gnunet] 07/15: 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 ea1d45f9f6fda99b0e8dd3ada75433b650983113
Merge: be35c296d 733e5b784
Author: xrs <address@hidden>
AuthorDate: Mon Mar 13 17:48:53 2017 +0100

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

 doc/gnunet-c-tutorial.tex                          |   11 +-
 src/cadet/Makefile.am                              |   26 +-
 src/cadet/TODO                                     |   10 +-
 src/cadet/cadet_api.c                              | 1763 +++++---------------
 src/cadet/cadet_api_new.c                          | 1711 -------------------
 src/cadet/cadet_common.c                           |  370 ----
 src/cadet/cadet_test_lib.c                         |    4 +-
 src/cadet/gnunet-cadet.c                           |    6 +-
 src/cadet/test_cadet.c                             |    6 +-
 src/cadet/test_cadet_local_mq.c                    |   12 +-
 src/conversation/Makefile.am                       |    2 +-
 src/conversation/gnunet-service-conversation.c     |    6 +-
 src/exit/Makefile.am                               |    2 +-
 src/exit/gnunet-daemon-exit.c                      |   10 +-
 src/fs/Makefile.am                                 |    2 +-
 src/fs/gnunet-service-fs_cadet_client.c            |    4 +-
 src/fs/gnunet-service-fs_cadet_server.c            |    4 +-
 src/include/gnunet_cadet_service.h                 |  523 ++----
 src/include/gnunet_datastore_service.h             |   27 -
 src/integration-tests/confs/test_defaults.conf     |    4 +-
 src/multicast/Makefile.am                          |    2 +-
 src/multicast/gnunet-service-multicast.c           |    6 +-
 src/pt/Makefile.am                                 |    2 +-
 src/pt/gnunet-daemon-pt.c                          |    4 +-
 src/rps/Makefile.am                                |   34 +-
 src/rps/gnunet-service-rps.c                       |  218 ++-
 src/rps/gnunet-service-rps_peers.c                 |   96 +-
 src/rps/gnunet-service-rps_peers.h                 |   37 +-
 src/rps/test_service_rps_peers.c                   |    8 +-
 src/scalarproduct/Makefile.am                      |    8 +-
 .../gnunet-service-scalarproduct-ecc_alice.c       |    4 +-
 .../gnunet-service-scalarproduct-ecc_bob.c         |    4 +-
 .../gnunet-service-scalarproduct_alice.c           |    4 +-
 .../gnunet-service-scalarproduct_bob.c             |    4 +-
 src/set/Makefile.am                                |    2 +-
 src/set/gnunet-service-set.c                       | 1351 +++++++--------
 src/set/gnunet-service-set.h                       |  354 ++--
 src/set/gnunet-service-set_intersection.c          |  542 +++---
 src/set/gnunet-service-set_union.c                 |  363 ++--
 src/set/set_api.c                                  |   62 +-
 src/set/test_set_api.c                             |   76 +-
 src/set/test_set_union_copy.c                      |    3 +-
 src/statistics/gnunet-service-statistics.c         |    7 +-
 src/util/client.c                                  |    8 +-
 src/util/service_new.c                             |   13 +-
 src/util/util.conf                                 |    5 +-
 src/vpn/Makefile.am                                |    2 +-
 src/vpn/gnunet-service-vpn.c                       |    4 +-
 48 files changed, 2270 insertions(+), 5456 deletions(-)


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