[GNUnet-SVN] [gnunet] 06/07: 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 f0a19819c13f90c7f6692fbefc68696d40c8769c
Merge: 4e5dcb2ae 95646a7b4
Author: xrs <address@hidden>
AuthorDate: Wed Mar 8 19:53:36 2017 +0100

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

 doc/gnunet-c-tutorial.pdf                  | Bin 262596 -> 293947 bytes
 doc/gnunet-c-tutorial.tex                  | 285 ++++++++++++-----------------
 doc/testbed_test.c                         | 112 +-----------
 src/arm/gnunet-arm.c                       |  44 ++---
 src/consensus/Makefile.am                  |   5 +-
 src/fs/fs_directory.c                      |  78 +++++---
 src/fs/fs_download.c                       | 107 +++++++----
 src/fs/fs_search.c                         |   7 +-
 src/fs/fs_tree.c                           |   6 +-
 src/fs/fs_unindex.c                        |   3 +-
 src/fs/fs_uri.c                            |  22 ++-
 src/include/gnunet_arm_service.h           |  18 +-
 src/include/gnunet_configuration_lib.h     |   7 +-
 src/include/gnunet_core_service.h          |  53 +-----
 src/secretsharing/Makefile.am              |   6 +-
 src/testbed/gnunet-service-testbed_peers.c |   6 -
 src/util/disk.c                            |  21 ++-
 17 files changed, 314 insertions(+), 466 deletions(-)

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