[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit a097690795f4f814de7cdbc97ef95fb899eeacd3
Merge: d039e8099 1a94233ae
Author: ng0 <address@hidden>
AuthorDate: Thu Apr 25 22:30:04 2019 +0000

    Merge branch 'master' of gnunet.org:gnunet

 src/identity/Makefile.am               |   5 +-
 src/identity/plugin_rest_identity.c    |   9 -
 src/include/gnunet_peerstore_service.h |   8 +
 src/json/json_gnsrecord.c              |  48 ++--
 src/namestore/plugin_rest_namestore.c  | 414 ++++++++++++++-------------
 src/transport/gnunet-service-tng.c     | 495 ++++++++++++++++++++++++---------
 6 files changed, 611 insertions(+), 368 deletions(-)

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