[gnunet] 02/04: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 7d5ac971847a289b5923fec845349c342a61ddf7
Merge: 61f7c7d61 b03978816
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sat Feb 15 14:46:13 2020 +0100

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

 src/transport/test_communicator_basic.c | 56 ++++++++++++++-----------------
 src/transport/transport-testing2.c      | 59 +++++++++++++++++----------------
 src/transport/transport-testing2.h      | 16 ++++++---
 src/util/scheduler.c                    |  6 ++--
 4 files changed, 70 insertions(+), 67 deletions(-)

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