[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 78eeba903d3cd5ccde3b2fffa52d7120f5b09fd2
Merge: 1cc13d48e 8d7ab1640
Author: Nils Gillmann <address@hidden>
AuthorDate: Wed May 23 08:12:08 2018 +0000

    Merge branch 'master' of gnunet.org:gnunet

 src/cadet/cadet_test_lib.c                    |  65 ++--
 src/cadet/test_cadet.c                        |  52 ++-
 src/cadet/{test_cadet.c => test_cadet_flow.c} | 440 ++++++--------------------
 src/cadet/test_cadet_local_mq.c               |  12 +-
 src/dht/gnunet_dht_profiler.c                 |   4 +-
 src/gns/gnunet-gns-benchmark.c                |   3 +
 6 files changed, 174 insertions(+), 402 deletions(-)

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