[GNUnet-SVN] [gnunet] 12/15: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

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

xrs pushed a commit to branch master
in repository gnunet.

commit 990c536e0f1c4adce5ba49897e2084d6296fdafc
Merge: 03512957f 2b87f173e
Author: xrs <address@hidden>
AuthorDate: Wed Mar 29 19:07:29 2017 +0200

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

 doc/gnunet-c-tutorial.tex                          |  16 +-
 src/arm/gnunet-arm.c                               |  24 +-
 src/ats-tests/gnunet-solver-eval.c                 |   6 +-
 src/ats-tool/gnunet-ats.c                          |  22 +-
 src/ats/gnunet-ats-solver-eval.c                   |  12 +-
 src/ats/perf_ats_solver.c                          |  14 +-
 src/auction/gnunet-auction-create.c                |  14 +-
 src/cadet/cadet_protocol.h                         |  43 ++-
 src/cadet/gnunet-cadet.c                           |  16 +-
 src/cadet/gnunet-service-cadet.c                   |  90 +++---
 src/cadet/gnunet-service-cadet.h                   |  34 ++-
 src/cadet/gnunet-service-cadet_channel.c           | 106 +++++--
 src/cadet/gnunet-service-cadet_channel.h           |  30 +-
 src/cadet/gnunet-service-cadet_peer.h              |   3 +-
 src/cadet/gnunet-service-cadet_tunnels.c           |  23 +-
 src/cadet/test_cadet.c                             |   4 +-
 src/consensus/gnunet-consensus-profiler.c          |  16 +-
 src/conversation/Makefile.am                       |   2 +-
 src/conversation/gnunet-conversation.c             |   4 +-
 .../gnunet-helper-audio-playback-gst.c             |  69 ++---
 src/conversation/gnunet-helper-audio-record-gst.c  |   9 +-
 src/conversation/gnunet_gst.c                      |  54 ++--
 src/conversation/gnunet_gst_def.h                  |   2 +-
 src/conversation/gnunet_gst_test.c                 |   7 +-
 src/core/gnunet-core.c                             |   2 +-
 src/datastore/gnunet-datastore.c                   |   2 +-
 src/datastore/perf_datastore_api.c                 |   2 +
 src/datastore/perf_plugin_datastore.c              |  33 ++-
 src/dht/gnunet-dht-get.c                           |  12 +-
 src/dht/gnunet-dht-monitor.c                       |   8 +-
 src/dht/gnunet-dht-put.c                           |  16 +-
 src/dht/gnunet_dht_profiler.c                      |  16 +-
 src/dns/gnunet-dns-monitor.c                       |   6 +-
 src/dns/gnunet-dns-redirector.c                    |   6 +-
 src/dv/gnunet-dv.c                                 |   2 +-
 src/fs/gnunet-auto-share.c                         |  12 +-
 src/fs/gnunet-download.c                           |  16 +-
 src/fs/gnunet-fs-profiler.c                        |   6 +-
 src/fs/gnunet-fs.c                                 |   4 +-
 src/fs/gnunet-publish.c                            |  26 +-
 src/fs/gnunet-search.c                             |  12 +-
 src/fs/gnunet-unindex.c                            |   2 +-
 src/gns/gnunet-bcd.c                               |   2 +-
 src/gns/gnunet-dns2gns.c                           |  10 +-
 src/gns/gnunet-gns-proxy.c                         |   4 +-
 src/gns/gnunet-gns.c                               |  12 +-
 src/gns/plugin_rest_gns.c                          |   1 +
 src/hostlist/gnunet-daemon-hostlist.c              |   8 +-
 src/identity-provider/gnunet-identity-token.c      |   4 +-
 .../gnunet-service-identity-provider.c             |   1 +
 .../plugin_rest_identity_provider.c                |   3 +
 src/identity/gnunet-identity.c                     |  12 +-
 src/include/gnunet_getopt_lib.h                    |  38 +--
 src/include/gnunet_network_lib.h                   |  12 +
 src/include/gnunet_scheduler_lib.h                 | 246 +++++++++++++++-
 src/namecache/gnunet-namecache.c                   |   4 +-
 src/namestore/gnunet-namestore.c                   |  28 +-
 src/namestore/plugin_rest_namestore.c              |  11 +-
 src/nat-auto/gnunet-nat-auto.c                     |  10 +-
 src/nat/gnunet-nat.c                               |  14 +-
 src/nse/gnunet-nse-profiler.c                      |  14 +-
 src/peerinfo-tool/gnunet-peerinfo.c                |  16 +-
 src/regex/gnunet-regex-profiler.c                  |  10 +-
 src/regex/gnunet-regex-simulation-profiler.c       |   4 +-
 src/rest/gnunet-rest-server.c                      |   2 +-
 src/revocation/gnunet-revocation.c                 |   8 +-
 src/rps/gnunet-rps.c                               |   2 +-
 src/scalarproduct/gnunet-scalarproduct.c           |   8 +-
 src/secretsharing/gnunet-secretsharing-profiler.c  |  12 +-
 src/set/gnunet-set-ibf-profiler.c                  |  10 +-
 src/set/gnunet-set-profiler.c                      |  18 +-
 src/social/gnunet-social.c                         |  58 ++--
 src/statistics/gnunet-statistics.c                 |  14 +-
 src/testbed/generate-underlay-topology.c           |   2 +-
 src/testbed/gnunet-testbed-profiler.c              |   8 +-
 src/testing/gnunet-testing.c                       |  10 +-
 src/testing/list-keys.c                            |   2 +-
 src/transport/gnunet-transport-profiler.c          |  14 +-
 src/transport/gnunet-transport.c                   |  22 +-
 src/transport/tcp_service_legacy.c                 |  12 +-
 src/util/getopt_helpers.c                          |  34 +--
 src/util/gnunet-config.c                           |  12 +-
 src/util/gnunet-ecc.c                              |  10 +-
 src/util/gnunet-resolver.c                         |   2 +-
 src/util/gnunet-scrypt.c                           |   8 +-
 src/util/network.c                                 |  58 ++++
 src/util/program.c                                 |  10 +-
 src/util/scheduler.c                               | 328 ++++++++++++++++++++-
 src/util/service.c                                 |  12 +-
 src/util/test_getopt.c                             |  16 +-
 src/util/test_program.c                            |  14 +-
 src/vpn/gnunet-vpn.c                               |  18 +-
 92 files changed, 1385 insertions(+), 606 deletions(-)

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