[GNUnet-SVN] [gnunet] 27/45: Merge remote-tracking branch 'gnunet/master' into identity_oidc

[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 60c963315271ce4314b708bef519eb4fb64f0979
Merge: afb2171eb bca8edf17
Author: Phil <address@hidden>
AuthorDate: Thu Jan 11 10:21:52 2018 +0100

    Merge remote-tracking branch 'gnunet/master' into identity_oidc

 contrib/packages/guix/README                       |  64 ---
 contrib/packages/guix/gnunet-doc.scm               | 183 --------
 contrib/packages/guix/guix-env.scm                 | 210 ---------
 .../guix/packages/gnunet/packages/gnunet.scm       | 519 ---------------------
 .../guix/packages/gnunet/packages/texlive.scm      | 182 --------
 doc/documentation/chapters/developer.texi          |  15 +-
 contrib/packages/guix/gnunet.scm => guix-env.scm   |  31 +-
 guix.packages                                      |  44 ++
 src/cadet/gnunet-service-cadet_peer.c              |  10 +-
 src/fs/gnunet-service-fs_cp.c                      |   4 +-
 src/gns/gnunet-gns-proxy.c                         |  19 +-
 src/identity/plugin_rest_identity.c                |   3 +
 src/include/gnunet_crypto_lib.h                    |   2 +-
 src/rest/gnunet-rest-server.c                      |  49 +-
 src/rps/test_rps.c                                 |  74 ++-
 src/util/scheduler.c                               | 105 +++--
 16 files changed, 235 insertions(+), 1279 deletions(-)


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