[GNUnet-SVN] [gnunet] 41/41: Merge branch 'master' of gnunet.org:gnunet into doc/documentation

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

commit 862e488e08ca71db56dedd59059c5bb1a8c130a5
Merge: d387ba039 a2ce0b6a7
Author: ng0 <address@hidden>
AuthorDate: Tue Nov 28 19:59:46 2017 +0000

    Merge branch 'master' of gnunet.org:gnunet into doc/documentation

 doc/man/gnunet-ecc.1                         |   8 +-
 src/cadet/gnunet-service-cadet_paths.c       |   4 +-
 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/social/social_api.c                      |   2 +
 src/transport/gnunet-service-transport.c     |  10 +++
 src/transport/gnunet-service-transport_ats.c |   3 +-
 src/util/crypto_ecc.c                        |  45 +++++++++--
 src/util/crypto_rsa.c                        |   2 +-
 src/util/gnunet-ecc.c                        |  22 ++++-
 src/util/resolver_api.c                      |   1 +
 17 files changed, 200 insertions(+), 120 deletions(-)

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