[GNUnet-SVN] [gnunet] 04/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 2c709f49a4f9ab21293fc0160810d4dafa3c0ee6
Merge: 000d13da5 c831b76d2
Author: xrs <address@hidden>
AuthorDate: Sat Oct 7 22:11:33 2017 +0200

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

 src/ats-tool/gnunet-ats.c               | 6 +++---
 src/cadet/gnunet-service-cadet_paths.c  | 2 +-
 src/conversation/gnunet-conversation.c  | 2 +-
 src/core/gnunet-service-core_sessions.c | 1 +
 src/dns/dnsparser.c                     | 4 ++--
 src/secretsharing/Makefile.am           | 2 +-
 src/social/gnunet-social.c              | 2 +-
 src/testbed/testbed_api_topology.c      | 2 +-
 src/topology/friends.c                  | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

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