[GNUnet-SVN] [gnunet] 05/05: Merge branch 'master' of https://gnunet.org/git/gnunet

[gnunet]

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

lurchi pushed a commit to branch master
in repository gnunet.

commit ea351cef94af33ccf28c66434c28aefc100ad6e0
Merge: 1522c35f3 9a558c93b
Author: lurchi <address@hidden>
AuthorDate: Sun Jan 7 00:59:50 2018 +0100

    Merge branch 'master' of https://gnunet.org/git/gnunet

 AUTHORS                                    |  1 +
 doc/documentation/chapters/developer.texi  | 12 ++++----
 doc/documentation/chapters/philosophy.texi | 11 ++++----
 doc/documentation/chapters/user.texi       |  6 +++-
 src/fs/fs_search.c                         | 19 +++++++++++--
 src/fs/fs_uri.c                            | 25 ++++++++++++-----
 src/gns/gnunet-dns2gns.c                   | 45 ++++++++++++++++++++----------
 src/include/gnunet_fs_service.h            |  3 +-
 src/peerinfo/gnunet-service-peerinfo.c     |  6 ++--
 src/set/gnunet-service-set_union.c         |  9 +++---
 src/transport/plugin_transport_tcp.c       |  7 +++--
 src/util/common_allocation.c               |  1 +
 src/util/configuration.c                   |  1 -
 13 files changed, 99 insertions(+), 47 deletions(-)

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