[GNUnet-SVN] [gnunet] 03/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 02babcf349e9b80f4ff12893b4f8a78601c0e91c
Merge: 7cd462b98 7d473d08b
Author: xrs <address@hidden>
AuthorDate: Sun Mar 12 15:34:30 2017 +0100

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

 src/arm/gnunet-service-arm.c                       |    1 +
 src/cadet/Makefile.am                              |  208 +-
 src/cadet/cadet.conf.in                            |    2 +-
 src/cadet/cadet.h                                  |    2 +-
 src/cadet/cadet_path.c                             |  363 --
 src/cadet/cadet_path.h                             |  226 --
 src/cadet/cadet_protocol.h                         |  150 +-
 src/cadet/cadet_test_lib.c                         |  135 +-
 src/cadet/cadet_test_lib.h                         |   40 +-
 src/cadet/cadet_test_lib_new.c                     |  362 --
 src/cadet/cadet_test_lib_new.h                     |  106 -
 src/cadet/gnunet-service-cadet-new.c               | 1496 -------
 src/cadet/gnunet-service-cadet-new_channel.c       | 2040 ----------
 src/cadet/gnunet-service-cadet-new_channel.h       |  262 --
 src/cadet/gnunet-service-cadet-new_connection.c    | 1093 ------
 src/cadet/gnunet-service-cadet-new_connection.h    |  339 --
 src/cadet/gnunet-service-cadet-new_dht.c           |  351 --
 src/cadet/gnunet-service-cadet-new_dht.h           |  100 -
 src/cadet/gnunet-service-cadet-new_hello.c         |  152 -
 src/cadet/gnunet-service-cadet-new_hello.h         |   80 -
 src/cadet/gnunet-service-cadet-new_peer.c          | 1478 -------
 src/cadet/gnunet-service-cadet-new_peer.h          |  394 --
 src/cadet/gnunet-service-cadet.c                   | 1470 ++++++-
 ...-service-cadet-new.h => gnunet-service-cadet.h} |    2 +-
 src/cadet/gnunet-service-cadet_channel.c           | 3499 +++++++----------
 src/cadet/gnunet-service-cadet_channel.h           |  387 +-
 src/cadet/gnunet-service-cadet_connection.c        | 4104 ++++----------------
 src/cadet/gnunet-service-cadet_connection.h        |  605 +--
 ...adet-new_core.c => gnunet-service-cadet_core.c} |   10 +-
 ...adet-new_core.h => gnunet-service-cadet_core.h} |    0
 src/cadet/gnunet-service-cadet_dht.c               |  373 +-
 src/cadet/gnunet-service-cadet_dht.h               |   49 +-
 src/cadet/gnunet-service-cadet_hello.c             |  140 +-
 src/cadet/gnunet-service-cadet_hello.h             |    5 +-
 src/cadet/gnunet-service-cadet_local.c             | 1553 --------
 src/cadet/gnunet-service-cadet_local.h             |  234 --
 ...et-new_paths.c => gnunet-service-cadet_paths.c} |   10 +-
 ...et-new_paths.h => gnunet-service-cadet_paths.h} |    2 +-
 src/cadet/gnunet-service-cadet_peer.c              | 2990 ++++++--------
 src/cadet/gnunet-service-cadet_peer.h              |  519 +--
 src/cadet/gnunet-service-cadet_tunnel.c            | 3501 -----------------
 src/cadet/gnunet-service-cadet_tunnel.h            |  616 ---
 ...ew_tunnels.c => gnunet-service-cadet_tunnels.c} |   13 +-
 ...ew_tunnels.h => gnunet-service-cadet_tunnels.h} |    4 +-
 src/cadet/test_cadet.c                             |  795 ++--
 src/cadet/test_cadet_local.c                       |  351 --
 src/cadet/test_cadet_new.c                         | 1105 ------
 src/cadet/test_cadet_single.c                      |  354 --
 src/datacache/Makefile.am                          |    1 +
 src/datacache/plugin_datacache_sqlite.c            |  549 +--
 src/datastore/plugin_datastore_sqlite.c            |  714 ++--
 src/include/gnunet_sq_lib.h                        |   11 +
 src/revocation/test_revocation.c                   |   20 +-
 src/set/Makefile.am                                |    2 +-
 src/set/gnunet-service-set.c                       |  284 +-
 src/set/gnunet-service-set.h                       |   50 +-
 src/set/gnunet-service-set_intersection.c          |  139 +-
 src/set/gnunet-service-set_union.c                 |  682 ++--
 src/set/set_api.c                                  |   12 +-
 src/set/test_set_union_copy.c                      |    1 +
 src/sq/sq.c                                        |   25 +
 src/sq/sq_query_helper.c                           |   44 +-
 src/sq/sq_result_helper.c                          |   67 +-
 63 files changed, 7613 insertions(+), 27059 deletions(-)

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