[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of ssh://gnunet.org/g
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of ssh://gnunet.org/gnunet |
|
Date: |
Fri, 10 Mar 2017 20:40:59 +0100 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a commit to branch master
in repository gnunet.
commit 87798f3ef0f7db096f6ce0a2cb4145dd3a857941
Merge: 16d8bc7e0 94c86ded6
Author: xrs <address@hidden>
AuthorDate: Fri Mar 10 20:40:17 2017 +0100
Merge branch 'master' of ssh://gnunet.org/gnunet
src/ats-tests/gnunet-ats-sim.c | 14 +-
src/ats-tests/gnunet-solver-eval.c | 18 +-
src/block/bg_bf.c | 1 +
src/cadet/gnunet-service-cadet-new_channel.c | 11 +-
src/cadet/gnunet-service-cadet-new_peer.c | 1 +
src/consensus/gnunet-service-consensus.c | 3 +-
src/conversation/gnunet-service-conversation.c | 1 -
src/datastore/Makefile.am | 1 +
src/datastore/datastore_api.c | 47 ++++-
src/datastore/gnunet-service-datastore.c | 2 +-
src/datastore/plugin_datastore_sqlite.c | 203 ++++++++++-----------
src/dht/gnunet-dht-put.c | 5 +-
src/dns/Makefile.am | 1 +
src/fs/fs_search.c | 58 +++---
src/fs/gnunet-helper-fs-publish.c | 2 +-
src/fs/gnunet-service-fs.c | 1 -
src/fs/gnunet-service-fs_lc.c | 33 ----
src/fs/gnunet-service-fs_lc.h | 33 ----
src/gns/plugin_gnsrecord_gns.c | 18 +-
src/include/gnunet_sq_lib.h | 24 +--
src/nat-auto/gnunet-nat-auto.c | 25 ++-
src/nat/gnunet-nat.c | 45 ++---
src/nat/gnunet-service-nat_externalip.c | 1 +
src/nat/nat_api.c | 4 +
src/nat/nat_stun.h | 15 +-
src/pt/gnunet-daemon-pt.c | 2 +-
src/sq/sq.c | 9 +-
src/testbed/gnunet-service-testbed_oc.c | 2 +-
src/testbed/testbed_api_topology.c | 8 +-
src/testing/testing.c | 1 +
.../gnunet-transport-certificate-creation.c | 2 +-
src/transport/plugin_transport_udp.c | 2 +-
src/transport/transport-testing-loggers.c | 1 +
src/transport/transport-testing-main.c | 22 ++-
src/transport/transport-testing.c | 26 +--
src/util/service_new.c | 1 +
src/util/socks.c | 84 ++++++---
src/vpn/gnunet-service-vpn.c | 5 +-
38 files changed, 387 insertions(+), 345 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden