[GNUnet-SVN] [gnunet] 02/04: Merge branch 'master' of git+ssh://gnunet.org/gnunet

[gnunet]

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

bart-polot pushed a commit to branch master
in repository gnunet.

commit 016df6e36aed193ebdb8ee5f4e9f90c486750a3e
Merge: 53dae5817 adf28e389
Author: Bart Polot <address@hidden>
AuthorDate: Fri Jan 27 04:50:20 2017 +0100

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

 src/cadet/cadet_protocol.h                      |  12 +-
 src/cadet/gnunet-service-cadet-new.c            |  22 ++-
 src/cadet/gnunet-service-cadet-new.h            |   5 +
 src/cadet/gnunet-service-cadet-new_channel.c    | 214 ++++++++++++++++--------
 src/cadet/gnunet-service-cadet-new_connection.c |   3 +-
 src/cadet/gnunet-service-cadet-new_paths.c      |   2 +-
 src/cadet/gnunet-service-cadet-new_peer.c       |  56 ++++++-
 src/cadet/gnunet-service-cadet-new_tunnels.c    |  29 +---
 8 files changed, 239 insertions(+), 104 deletions(-)

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