[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 04/04: Merge branch 'master' of ssh://gnunet.org/g
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 04/04: Merge branch 'master' of ssh://gnunet.org/gnunet |
|
Date: |
Tue, 26 Jun 2018 12:31:26 +0200 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a commit to branch master
in repository gnunet.
commit 0759e1e79accb055a4d175729b631d42486b08dc
Merge: fb3a42054 2bdcb4fa9
Author: xrs <address@hidden>
AuthorDate: Tue Jun 26 12:31:04 2018 +0200
Merge branch 'master' of ssh://gnunet.org/gnunet
src/cadet/cadet.h | 10 +++++
src/cadet/cadet_api.c | 22 +++++-----
src/cadet/gnunet-cadet.c | 52 +++++++++++++++---------
src/cadet/gnunet-service-cadet.c | 64 ++++++++++++++++++++++++++----
src/cadet/gnunet-service-cadet_paths.c | 2 +-
src/cadet/gnunet-service-cadet_peer.c | 35 ++++++++++++++++
src/cadet/gnunet-service-cadet_peer.h | 13 ++++++
src/include/gnunet_cadet_service.h | 4 +-
src/topology/Makefile.am | 1 +
src/topology/test_gnunet_daemon_topology.c | 32 +++++++--------
src/util/tun.c | 4 +-
11 files changed, 179 insertions(+), 60 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden