gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 53/75: -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
Date: Thu, 09 Aug 2018 23:58:50 +0200

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

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

commit db8c5cd31a92cd18450bf9d2d595a8fd314583e0
Merge: 4e6cb0184 d87371054
Author: Phil <address@hidden>
AuthorDate: Mon Jun 25 00:17:34 2018 +0200

    -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

 README                                             |   25 +-
 bin/grephdr.sh                                     |    3 +-
 bin/grepsrc.sh                                     |    1 +
 bin/pogen.sh                                       |    1 +
 bin/rename.sh                                      |    1 +
 bootstrap                                          |   23 +-
 configure.ac                                       |   82 +-
 contrib/Makefile.am                                |    4 +-
 .../logo/lynXified-amirouche-anonymous-v3.png      |  Bin 0 -> 71137 bytes
 contrib/branding/logo/lynXified-amirouche-v3.svg   |  918 ++++
 contrib/ci/buildbot/ssh-keys                       |    1 +
 contrib/ci/docker/Dockerfile                       |    2 +-
 contrib/conf/gnunet/no_autostart_above_core.conf   |   58 +-
 contrib/conf/gnunet/no_forcestart.conf             |   26 +-
 contrib/nse/experiments/infiniband.conf            |   32 +-
 .../testbed_configs/regex_profiler_infiniband.conf |   22 +-
 contrib/testbed_configs/testbed_cluster.conf       |   28 +-
 contrib/testbed_configs/testbed_infiniband.conf    |   28 +-
 contrib/testbed_configs/testbed_supermuc.conf      |   16 +-
 doc/documentation/chapters/developer.texi          |   26 +-
 doc/documentation/chapters/user.texi               |   25 +-
 doc/documentation/gnunet-c-tutorial.texi           |    2 +-
 doc/man/gnunet-auto-share.1                        |    2 +-
 doc/man/gnunet-namestore-fcfsd.1                   |    2 +-
 doc/man/gnunet-statistics.1                        |    7 +
 doc/man/gnunet.conf.5                              |   16 +-
 guix-env.scm                                       |    4 +-
 po/POTFILES.in                                     |  124 +-
 po/de.po                                           | 4436 +++++++++----------
 po/es.po                                           | 4436 +++++++++----------
 po/fr.po                                           | 4432 +++++++++----------
 po/sv.po                                           | 4434 +++++++++----------
 po/vi.po                                           | 4437 ++++++++++----------
 po/zh_CN.po                                        | 4437 ++++++++++----------
 src/arm/arm.conf.in                                |    6 +-
 src/arm/gnunet-service-arm.c                       |  192 +-
 src/arm/test_arm_api_data.conf                     |   14 +-
 src/ats-tests/Makefile.am                          |    1 +
 src/ats/ats.conf.in                                |    2 +-
 src/ats/ats_api_performance.c                      |    8 +-
 src/ats/plugin_ats_proportional.c                  |    2 +-
 src/auction/auction.conf                           |    2 +-
 src/cadet/cadet.conf.in                            |    4 +-
 src/cadet/gnunet-cadet.c                           |    1 +
 src/cadet/gnunet-service-cadet.c                   |    2 +-
 src/cadet/test_cadet.conf                          |   32 +-
 src/consensus/consensus.conf.in                    |    2 +-
 src/consensus/test_consensus.conf                  |   18 +-
 src/conversation/conversation.conf.in              |    2 +-
 src/core/core.conf.in                              |    2 +-
 src/core/test_core_api_send_to_self.conf           |    2 +-
 src/credential/credential.conf.in                  |    4 +-
 src/credential/test_credential_lookup.conf         |    6 +-
 src/datastore/datastore.conf.in                    |    2 +-
 src/datastore/plugin_datastore_sqlite.c            |    3 +-
 src/datastore/test_defaults.conf                   |    2 +-
 src/dht/dht.conf.in                                |    4 +-
 src/dht/test_dht_2dtorus.conf                      |    6 +-
 src/dht/test_dht_api_data.conf                     |    6 +-
 src/dht/test_dht_api_peer1.conf                    |    6 +-
 src/dht/test_dht_line.conf                         |    6 +-
 src/dht/test_dht_monitor.conf                      |    6 +-
 src/dht/test_dht_multipeer.conf                    |    6 +-
 src/dht/test_dht_tools.conf                        |   82 +-
 src/dns/dns.conf.in                                |    2 +-
 src/dns/gnunet-service-dns.c                       |   17 +-
 src/dv/dv.conf.in                                  |    2 +-
 src/dv/test_transport_dv_data.conf                 |    4 +-
 src/fragmentation/test_fragmentation_data.conf     |    2 +-
 src/fs/fs.conf.in                                  |    6 +-
 src/fs/fs_api.c                                    |    2 +-
 src/fs/fs_test_lib_data.conf                       |    2 +-
 src/fs/gnunet-service-fs_pr.c                      |    2 +-
 src/fs/test_gnunet_fs_psd.py.in                    |   23 +-
 src/gns/gns-helper-service-w32.conf                |    2 +-
 src/gns/gns.conf.in                                |   14 +-
 src/gns/gns_api.c                                  |    6 +-
 src/gns/gns_tld_api.c                              |    6 +-
 src/gns/gnunet-gns-proxy.c                         |  201 +-
 src/gns/gnunet-service-gns_interceptor.c           |    2 +-
 src/gns/gnunet-service-gns_resolver.c              |    4 +-
 src/gns/test_gns_lookup.conf                       |    4 +-
 src/gns/test_gns_nick_shorten.conf                 |    4 +-
 src/gns/test_gns_proxy.conf                        |    4 +-
 src/gns/test_gns_simple_lookup.conf                |   16 +-
 src/gnsrecord/gnsrecord_serialization.c            |   29 +-
 src/hostlist/hostlist.conf                         |    2 +-
 .../test_gnunet_daemon_hostlist_peer1.conf         |    4 +-
 .../test_gnunet_daemon_hostlist_peer2.conf         |    4 +-
 src/hostlist/test_learning_adv_peer.conf           |    4 +-
 src/hostlist/test_learning_learn_peer.conf         |    4 +-
 src/hostlist/test_learning_learn_peer2.conf        |    4 +-
 src/identity-provider/identity-provider.conf       |    4 +-
 src/identity-provider/test_idp.conf                |    8 +-
 src/identity/identity.conf.in                      |    4 +-
 src/include/gnunet_common.h                        |   12 +-
 src/include/gnunet_gns_service.h                   |    6 +-
 src/include/gnunet_gnsrecord_lib.h                 |    4 +-
 src/integration-tests/confs/c_no_nat_client.conf   |    4 +-
 src/integration-tests/confs/c_no_nat_client_2.conf |    6 +-
 src/integration-tests/confs/test_defaults.conf     |   14 +-
 src/multicast/gnunet-service-multicast.c           |    6 +
 src/multicast/multicast.conf.in                    |    2 +-
 src/multicast/test_multicast.conf                  |   34 +-
 src/multicast/test_multicast_line.conf             |   34 +-
 src/multicast/test_multicast_star.conf             |   34 +-
 src/namecache/gnunet-service-namecache.c           |   19 +-
 src/namecache/namecache.conf.in                    |    4 +-
 src/namecache/namecache_api.c                      |    8 +-
 src/namestore/gnunet-namestore-fcfsd.c             |  440 +-
 src/namestore/gnunet-namestore.c                   |    7 +-
 src/namestore/namestore.conf.in                    |    6 +-
 src/namestore/test_namestore_api.conf              |    6 +-
 src/nat-auto/nat-auto.conf.in                      |    2 +-
 src/nat/nat.conf.in                                |    2 +-
 src/nat/test_nat_test_data.conf                    |    2 +-
 src/nse/nse.conf.in                                |    4 +-
 src/nse/nse_infiniband.conf                        |    4 +-
 src/nse/nse_profiler_test.conf                     |    6 +-
 src/nse/test_nse.conf                              |    2 +-
 src/peerinfo/peerinfo.conf.in                      |    2 +-
 src/peerinfo/test_peerinfo_api_data.conf           |    4 +-
 src/peerstore/peerstore.conf.in                    |    2 +-
 src/peerstore/test_peerstore_api_data.conf         |    2 +-
 src/psyc/Makefile.am                               |   14 +-
 src/psyc/psyc.conf.in                              |    2 +-
 src/psyc/test_psyc.conf                            |   12 +-
 src/psycstore/psycstore.conf.in                    |    2 +-
 src/pt/test_gns_vpn.conf                           |   26 +-
 src/pt/test_gnunet_vpn.conf                        |   10 +-
 src/regex/regex.conf.in                            |    2 +-
 src/regex/test_regex_api_data.conf                 |    4 +-
 src/revocation/revocation.conf.in                  |    4 +-
 src/revocation/test_revocation.conf                |    2 +-
 src/rps/gnunet-rps-profiler.c                      |   44 +-
 src/rps/gnunet-service-rps.c                       |   12 +-
 src/rps/rps.conf.in                                |    2 +-
 src/rps/test_rps.conf                              |   67 +-
 src/scalarproduct/scalarproduct.conf.in            |    4 +-
 src/secretsharing/secretsharing.conf.in            |    2 +-
 src/secretsharing/test_secretsharing.conf          |    8 +-
 src/set/set.conf.in                                |    2 +-
 src/set/test_set.conf                              |    2 +-
 src/social/social.conf.in                          |    4 +-
 src/social/test_social.conf                        |    2 +-
 src/statistics/gnunet-statistics.c                 |  570 ++-
 src/statistics/statistics.conf.in                  |    2 +-
 src/template/template.conf                         |    2 +-
 src/testbed-logger/testbed-logger.conf.in          |   12 +-
 src/testbed/test_testbed_api_barriers.conf.in      |   62 +-
 src/testbed/test_testbed_api_statistics.conf       |    2 +-
 src/testbed/test_testbed_api_template.conf         |    8 +-
 src/testbed/test_testbed_underlay.conf.in          |    6 +-
 src/testbed/testbed.conf.in                        |   10 +-
 src/testbed/testbed_api_topology.c                 |    4 +-
 src/topology/topology.conf                         |    2 +-
 .../test_transport_api_manipulation_cfg.c          |    1 +
 src/transport/transport.conf.in                    |    2 +-
 src/util/Makefile.am                               |    3 +
 src/util/common_logging.c                          |    4 +
 src/util/disk.c                                    |   21 +-
 src/util/getopt_helpers.c                          |    7 +
 src/util/gnunet-service-resolver.c                 |  269 +-
 src/util/resolver.conf.in                          |    2 +-
 src/util/resolver.h                                |   27 +
 src/util/resolver_api.c                            |   42 +-
 src/util/test_resolver_api.c                       |    2 +
 src/util/util.conf                                 |    2 +-
 src/vpn/vpn.conf.in                                |    2 +-
 src/zonemaster/zonemaster.conf.in                  |    8 +-
 170 files changed, 16532 insertions(+), 14359 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]