[GNUnet-SVN] [gnunet] 10/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 633c9ed2d8392f0620dee12513f65a4cc602ea60
Merge: 9f68c9e7d cd475225e
Author: xrs <address@hidden>
AuthorDate: Tue Mar 14 20:30:32 2017 +0100

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

 src/consensus/consensus_protocol.h               |  18 +-
 src/consensus/gnunet-service-consensus.c         |  13 +-
 src/datastore/plugin_datastore_sqlite.c          |  12 +-
 src/dv/gnunet-service-dv.c                       |   4 +-
 src/include/gnunet_peerstore_service.h           |   4 +-
 src/peerstore/Makefile.am                        |   4 +-
 src/peerstore/gnunet-service-peerstore.c         |  28 +-
 src/peerstore/peerstore.h                        |   2 +-
 src/peerstore/peerstore_api.c                    |  27 +-
 src/peerstore/peerstore_common.c                 |  20 +-
 src/peerstore/peerstore_common.h                 |   2 +-
 src/peerstore/plugin_peerstore_flat.c            |  49 ++-
 src/peerstore/plugin_peerstore_sqlite.c          | 464 +++++++++++---------
 src/peerstore/test_peerstore_api_iterate.c       |  73 +++-
 src/peerstore/test_peerstore_api_store.c         |  55 ++-
 src/peerstore/test_plugin_peerstore.c            | 127 ++++--
 src/secretsharing/gnunet-service-secretsharing.c | 511 ++++++++++++-----------
 src/sq/sq_query_helper.c                         |   8 +
 src/sq/sq_result_helper.c                        |   7 +
 src/testbed/Makefile.am                          |   4 +-
 20 files changed, 848 insertions(+), 584 deletions(-)

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