[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of ssh://gnunet.org/g
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of ssh://gnunet.org/gnunet |
|
Date: |
Wed, 30 May 2018 10:29:29 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 30fb422df59da0e650eb790933dadbd4bb189658
Merge: 0a0ac96d8 a46fff931
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed May 30 10:28:51 2018 +0200
Merge branch 'master' of ssh://gnunet.org/gnunet
.gitignore | 8 +-
README | 13 +-
{contrib => bin}/pogen.sh | 0
bootstrap | 2 +-
configure.ac | 2 +
contrib/3rdparty/Windows/openvpn-tap32/COPYING | 340 ++++++++++++++++
.../{ => 3rdparty/Windows}/openvpn-tap32/INSTALL | 0
.../openvpn-tap32/tap32-signed-i386-2.1.zip | Bin
.../Windows}/openvpn-tap32/tap32-source-2.1.zip | Bin
.../Windows}/openvpn-tap32/tapw32/OemWin2k.inf | 0
.../Windows}/openvpn-tap32/tapw32/tap0901.cat | Bin
.../Windows}/openvpn-tap32/tapw32/tap0901.sys | Bin
.../Windows}/openvpn-tap32/tapw64/OemWin2k.inf | 0
.../Windows}/openvpn-tap32/tapw64/tap0901.cat | Bin
.../Windows}/openvpn-tap32/tapw64/tap0901.sys | Bin
contrib/Makefile.am | 90 ++---
contrib/{ => branding/logo}/gnunet-logo-big.png | Bin
contrib/{ => branding/logo}/gnunet-logo-color.png | Bin
contrib/{ => branding/logo}/gnunet-logo.pdf | Bin
contrib/buildslave-0.8.6p1-gnunet-w32.patch | 202 ----------
contrib/{ => ci/buildbot}/buildbot-update.sh | 0
contrib/{ => ci/buildbot}/ssh-config | 0
contrib/{ => ci/buildbot}/ssh-keys | 0
contrib/{ => ci/docker}/Dockerfile | 7 +-
contrib/{ => ci/docker}/docker-entrypoint.sh | 0
contrib/{ => conf/colorit}/colorit.conf | 0
.../editors/eclipse}/gnunet_codingstyle.xml | 0
.../{ => conf/gnunet}/no_autostart_above_core.conf | 0
contrib/{ => conf/gnunet}/no_forcestart.conf | 0
contrib/{ => conf/nss}/nssswitch.conf | 0
{bin => contrib/conf/wireshark}/wireshark.lua | 0
contrib/{ => gns}/bootstrap.min.css | 0
contrib/{ => gns}/def.tex | 0
contrib/{ => gns}/gns-bcd.html | 0
contrib/{ => gns}/gns-bcd.tex | 2 +-
contrib/{ => gns}/gns-form-fields.xml | 0
contrib/{ => gns}/gns-form.xslt | 0
contrib/gnunet_janitor.py.in | 78 ----
contrib/gnunet_pyexpect.py.in | 83 ----
.../nse => nse/experiments}/infiniband.conf | 0
contrib/{ => patches}/lrn-indent.diff | 0
contrib/{ => patches}/texi2html5-indent.diff | 0
contrib/{ => patches}/transport_ats_years.diff | 0
contrib/removetrailingwhitespace | 14 -
contrib/repeat.sh | 1 -
contrib/scripts/.gitignore | 2 +
contrib/{ => scripts}/coverage.sh | 0
contrib/{ => scripts}/debug | 0
.../scripts/documentation/gnunet-doc.scm | 113 +++---
contrib/{ => scripts}/find_typedefs.py | 3 +
contrib/{ => scripts}/gdb-iterate-dll.py | 3 +
contrib/{ => scripts}/generate-monkey-db.sh | 0
contrib/{ => scripts}/gnunet-chk.py.in | 4 +-
.../{ => scripts/gnunet-logread}/gnunet-logread | 2 +-
.../gnunet-logread}/gnunet-logread-ipc | 1 +
.../gnunet-logread}/gnunet-logread-ipc-sdedit | 2 +-
contrib/{ => scripts}/gnunet-suidfix | 0
contrib/scripts/gnunet_janitor.py.in | 81 ++++
contrib/scripts/gnunet_pyexpect.py.in | 84 ++++
contrib/scripts/lint-python.sh | 24 ++
contrib/{ => scripts}/process_log.sh | 0
contrib/{ => scripts}/pydiffer.py.in | 0
contrib/{ => scripts}/pydmesg | 0
contrib/{ => scripts}/regression.sh | 0
contrib/scripts/removetrailingwhitespace.py.in | 15 +
contrib/{ => scripts}/report.sh | 0
contrib/{ => scripts}/revisionary.sh | 0
contrib/scripts/terminate.py.in | 68 ++++
contrib/{ => scripts}/testbed_cleanup.sh | 0
doc/hacks.el => contrib/scripts/texinfo-hacks.el | 1 +
contrib/{ => scripts}/visualize_stats.sh | 0
contrib/{ => scripts}/zonewalk-to-types.sh | 8 +-
contrib/terminate.py.in | 64 ---
contrib/testbed_perfhacks.patch | 90 -----
contrib/testbed_setup_pre_ecc_tree.sh | 9 -
contrib/testing_hostkeys.ecc | Bin 131072 -> 131072 bytes
contrib/transpot_delay.patch | 77 ----
contrib/{ => web}/log.php | 0
doc/Makefile.am | 2 +-
doc/documentation/.gitignore | 7 +
doc/documentation/README.txt | 63 ---
doc/documentation/TODO | 106 +++++
doc/documentation/chapters/installation.texi | 54 +++
doc/documentation/gnunet-c-tutorial.texi | 62 +--
guix-env.scm | 2 -
pkgconfig/gnunetgns.pc.in | 2 +-
po/POTFILES.in | 7 +-
po/{update.pl => update.pl.in} | 2 +-
pre-commit | 4 +-
src/arm/test_arm_api_data.conf | 4 +-
src/arm/test_gnunet_arm.py.in | 185 ++++-----
src/ats-tests/template_perf_ats.conf | 2 +-
src/ats/test_ats_api.conf | 2 +-
src/ats/test_ats_api_delayed.conf | 2 +-
src/ats/test_ats_api_mlp.conf | 2 +-
src/ats/test_ats_api_proportional.conf | 2 +-
src/ats/test_ats_api_ril.conf | 2 +-
src/ats/test_ats_solver_default.conf | 2 +-
src/cadet/cadet_api.c | 25 +-
src/cadet/cadet_protocol.h | 33 ++
src/cadet/cadet_test_lib.c | 65 +--
src/cadet/gnunet-service-cadet.c | 1 +
src/cadet/gnunet-service-cadet_channel.c | 14 +-
src/cadet/gnunet-service-cadet_connection.c | 96 +++--
src/cadet/gnunet-service-cadet_connection.h | 4 +-
src/cadet/gnunet-service-cadet_core.c | 121 ++++--
src/cadet/gnunet-service-cadet_paths.c | 2 +-
src/cadet/gnunet-service-cadet_peer.c | 38 +-
src/cadet/gnunet-service-cadet_tunnels.c | 190 ++++++++-
src/cadet/test_cadet.c | 52 ++-
src/cadet/{test_cadet.c => test_cadet_flow.c} | 440 +++++----------------
src/cadet/test_cadet_local_mq.c | 12 +-
src/consensus/.gitignore | 1 +
src/consensus/Makefile.am | 20 +-
src/consensus/consensus-simulation.py | 108 -----
src/consensus/consensus-simulation.py.in | 110 ++++++
src/conversation/test_conversation.conf | 2 +-
src/core/test_core_defaults.conf | 4 +-
src/credential/test_credential_defaults.conf | 2 +-
src/datastore/test_defaults.conf | 4 +-
src/dht/gnunet_dht_profiler.c | 4 +-
src/dht/plugin_block_dht.c | 15 +-
src/dht/test_dht_2dtorus.conf | 4 +-
src/dht/test_dht_api_data.conf | 4 +-
src/dht/test_dht_api_peer1.conf | 4 +-
src/dht/test_dht_line.conf | 4 +-
src/dht/test_dht_monitor.conf | 4 +-
src/dht/test_dht_multipeer.conf | 4 +-
src/dht/test_dht_tools.py.in | 184 ++++-----
src/fs/test_fs_defaults.conf | 2 +-
src/fs/test_gnunet_fs_idx.py.in | 60 +--
src/fs/test_gnunet_fs_psd.py.in | 67 ++--
src/fs/test_gnunet_fs_rec.py.in | 134 +++----
src/gns/Makefile.am | 1 +
src/gns/gnunet-gns-benchmark.c | 22 +-
src/gns/gnunet-service-gns.c | 27 +-
src/gns/gnunet-service-gns_resolver.c | 135 ++++---
src/gns/test_gns_defaults.conf | 2 +-
src/gns/test_gns_gns2dns_cname_lookup.sh | 89 +++++
src/gnsrecord/gnsrecord_crypto.c | 83 ++--
src/gnsrecord/gnsrecord_serialization.c | 54 ++-
src/hostlist/test_hostlist_defaults.conf | 4 +-
src/identity-provider/test_idp_defaults.conf | 2 +-
src/include/gnunet_gnsrecord_lib.h | 4 +-
src/include/gnunet_mq_lib.h | 20 +
src/integration-tests/confs/test_defaults.conf | 4 +-
src/integration-tests/gnunet_testing.py.in | 207 +++++-----
.../test_integration_bootstrap_and_connect.py.in | 280 ++++++-------
.../test_integration_clique.py.in | 323 +++++++--------
.../test_integration_disconnect_nat.py.in | 324 +++++++--------
.../test_integration_reconnect_nat.py.in | 359 +++++++++--------
src/namestore/gnunet-namestore.c | 28 +-
src/namestore/gnunet-service-namestore.c | 377 ++++++++++--------
src/namestore/gnunet-zoneimport.c | 15 +-
src/namestore/namestore_api.c | 20 +-
src/namestore/namestore_api_monitor.c | 7 +-
src/namestore/plugin_namestore_flat.c | 16 +-
src/namestore/plugin_namestore_postgres.c | 11 +-
src/namestore/plugin_namestore_sqlite.c | 9 +-
src/namestore/test_namestore_api.conf | 4 +-
src/peerinfo-tool/test_gnunet_peerinfo.py.in | 90 ++---
src/peerinfo-tool/test_gnunet_peerinfo_data.conf | 2 +-
src/psyc/test_psyc.conf | 2 +-
src/regex/test_regex_api_data.conf | 4 +-
src/revocation/test_local_revocation.py.in | 139 ++++---
src/revocation/test_revocation.conf | 2 +-
src/rps/test_rps.conf | 4 +-
src/scalarproduct/test_scalarproduct.conf | 2 +-
src/set/test_set.conf | 2 +-
src/social/test_social.conf | 2 +-
src/statistics/test_gnunet_statistics.py.in | 262 ++++++------
src/statistics/test_statistics_api_data.conf | 4 +-
src/testbed/buildvars.py.in | 15 +-
src/testbed/test_testbed_api_template.conf | 4 +-
...st_transport_api_limited_sockets_tcp_peer1.conf | 2 +-
...st_transport_api_limited_sockets_tcp_peer2.conf | 2 +-
src/transport/test_transport_defaults.conf | 2 +-
src/util/common_logging.c | 14 +-
src/util/crypto_bug.c | 2 +-
src/util/crypto_ecc.c | 10 +
src/util/gnunet-qr.py.in | 173 ++++----
src/util/mq.c | 26 ++
src/util/resolver_api.c | 4 +-
tox.ini | 3 +-
184 files changed, 3874 insertions(+), 3166 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden