[GNUnet-SVN] [gnunet] 120/171: Merge remote-tracking branch 'origin/master' into identity_abe

[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 2b0c260c3ceab5b2d5a4c3a04f7e2a0a357e9d75
Merge: ca10195d9 664aca2d2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Oct 5 17:11:17 2017 +0200

    Merge remote-tracking branch 'origin/master' into identity_abe

 Makefile.am                                        |   7 +-
 README                                             |   2 +-
 configure.ac                                       |  17 ++
 contrib/packages/guix/gnunet-doc.scm               |  52 +++---
 .../packages/guix/{gnunet-doc.scm => gnunet.scm}   |  74 ++++-----
 contrib/packages/guix/guix-env.scm                 |   2 +-
 .../guix/packages/gnunet/packages/gnunet.scm       |  47 +++++-
 .../guix/packages/gnunet/packages/texlive.scm      | 182 +++++++++++++++++++++
 doc/.gitignore                                     |  11 +-
 doc/Makefile.am                                    | 177 +++++++++++++++-----
 doc/README.txt                                     |   2 +-
 doc/chapters/developer.texi                        |   5 +-
 doc/chapters/installation.texi                     |   2 +-
 doc/gnunet-c-tutorial.texi                         | 129 ++++++++++++++-
 doc/{ => images}/structure.dot                     |   0
 doc/man/gnunet-identity.1                          |   2 +-
 src/datastore/plugin_datastore_sqlite.c            |  29 +---
 src/fs/plugin_block_fs.c                           |  17 +-
 src/include/gnunet_set_service.h                   |   5 +-
 src/multicast/.gitignore                           |   2 +
 src/peerinfo/peerinfo_api.c                        |   5 +-
 .../gnunet-service-scalarproduct-ecc_alice.c       |   8 -
 .../gnunet-service-scalarproduct_alice.c           |   8 +-
 src/set/gnunet-service-set.c                       |  39 ++++-
 src/set/test_set_intersection_result_full.c        |   2 -
 src/set/test_set_union_result_symmetric.c          |   2 -
 src/social/test_social.c                           | 166 ++++++++++++-------
 src/transport/tcp_server_legacy.c                  |  20 +--
 src/util/.gitignore                                |   1 +
 src/util/network.c                                 |  16 +-
 src/util/scheduler.c                               |  14 +-
 31 files changed, 787 insertions(+), 258 deletions(-)


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