[GNUnet-SVN] [gnunet] 08/14: 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 bcc38ce02db13caa98fca172dcfa7b27a8ca984e
Merge: a12143a39 86e8c4d67
Author: xrs <address@hidden>
AuthorDate: Wed Nov 15 20:40:24 2017 +0100

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

 doc/man/gnunet-ecc.1                       |   8 +-
 src/datastore/datastore_api.c              | 115 ++++++++++++-----------------
 src/fs/fs_misc.c                           |   8 +-
 src/fs/fs_publish_ublock.c                 |   1 +
 src/include/gnunet_crypto_lib.h            |  20 ++++-
 src/include/gnunet_getopt_lib.h            |  54 +++++++-------
 src/include/gnunet_json_lib.h              |  10 +++
 src/json/json_generator.c                  |  13 ++++
 src/revocation/gnunet-service-revocation.c |   2 +
 src/transport/gnunet-service-transport.c   |  10 +++
 src/util/crypto_ecc.c                      |  45 +++++++++--
 src/util/crypto_rsa.c                      |   2 +-
 src/util/gnunet-ecc.c                      |  22 +++++-
 src/util/resolver_api.c                    |   1 +
 14 files changed, 195 insertions(+), 116 deletions(-)

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