gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] 69/171: Merge remote-tracking branch 'origin/maste


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 69/171: Merge remote-tracking branch 'origin/master' into credentials
Date: Thu, 04 Jan 2018 16:09:37 +0100

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

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

commit 59d393a1124cfd1aaffdf994bf6f8a9baaac8361
Merge: 3cb90c74c f27982470
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Jan 25 13:51:39 2017 +0100

    Merge remote-tracking branch 'origin/master' into credentials

 src/ats-tests/.gitignore                           |    6 +
 src/cadet/cadet.conf.in                            |    1 +
 src/cadet/cadet.h                                  |   35 +-
 src/cadet/cadet_api.c                              |  407 ++++----
 src/cadet/cadet_protocol.h                         |   39 +-
 src/cadet/gnunet-service-cadet-new.c               |  544 +++++-----
 src/cadet/gnunet-service-cadet-new.h               |   23 +
 src/cadet/gnunet-service-cadet-new_channel.c       | 1054 ++++++++++++++-----
 src/cadet/gnunet-service-cadet-new_channel.h       |   82 +-
 src/cadet/gnunet-service-cadet-new_connection.c    |  110 +-
 src/cadet/gnunet-service-cadet-new_connection.h    |   15 +-
 src/cadet/gnunet-service-cadet-new_core.c          |  175 ++--
 src/cadet/gnunet-service-cadet-new_dht.c           |   50 +-
 src/cadet/gnunet-service-cadet-new_dht.h           |    7 +
 src/cadet/gnunet-service-cadet-new_hello.c         |   16 +-
 src/cadet/gnunet-service-cadet-new_paths.c         |  361 +++++--
 src/cadet/gnunet-service-cadet-new_paths.h         |    4 +-
 src/cadet/gnunet-service-cadet-new_peer.c          |  594 +++++++----
 src/cadet/gnunet-service-cadet-new_peer.h          |   18 +-
 src/cadet/gnunet-service-cadet-new_tunnels.c       | 1078 ++++++++++++++------
 src/cadet/gnunet-service-cadet-new_tunnels.h       |   88 +-
 src/cadet/gnunet-service-cadet_channel.c           |   51 +-
 src/cadet/gnunet-service-cadet_channel.h           |    4 +-
 src/cadet/gnunet-service-cadet_connection.c        |   10 +-
 src/cadet/gnunet-service-cadet_connection.h        |    2 +-
 src/cadet/gnunet-service-cadet_local.c             |  153 ++-
 src/cadet/gnunet-service-cadet_local.h             |   14 +-
 src/cadet/gnunet-service-cadet_peer.c              |    4 +-
 src/cadet/gnunet-service-cadet_tunnel.c            |   67 +-
 src/cadet/gnunet-service-cadet_tunnel.h            |    6 +-
 src/cadet/test_cadet.c                             |  116 ++-
 src/cadet/test_cadet.conf                          |    2 +
 src/cadet/test_cadet_local.c                       |   76 +-
 src/cadet/test_cadet_single.c                      |   97 +-
 src/core/core_api.c                                |   14 +-
 src/core/gnunet-service-core_sessions.c            |   12 +-
 src/dht/gnunet-service-dht_clients.c               |   15 +-
 src/fragmentation/fragmentation.c                  |    5 +-
 src/fs/gnunet-service-fs_pe.c                      |    8 +-
 src/include/gnunet_cadet_service.h                 |  165 ++-
 src/include/gnunet_common.h                        |   16 +
 src/include/gnunet_protocols.h                     |   10 +
 src/include/gnunet_scheduler_lib.h                 |   45 +-
 src/nat/gnunet-service-nat.c                       |   22 +-
 src/nse/gnunet-service-nse.c                       |   34 +-
 src/topology/gnunet-daemon-topology.c              |    6 +-
 .../gnunet-service-transport_manipulation.c        |   20 +-
 .../gnunet-service-transport_neighbours.c          |    6 +-
 src/util/.gitignore                                |    1 +
 src/util/common_logging.c                          |   35 +-
 src/util/mq.c                                      |    7 +-
 src/util/scheduler.c                               |   85 +-
 src/util/strings.c                                 |    4 +-
 53 files changed, 3930 insertions(+), 1889 deletions(-)


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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]