gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 54/75: -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
Date: Thu, 09 Aug 2018 23:58:51 +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 6ede545d597509fefcc3d4fd2ef865bc5f57603f
Merge: db8c5cd31 bb3371542
Author: Phil <address@hidden>
AuthorDate: Mon Jul 2 15:42:34 2018 +0200

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

 .gitignore                                         |    1 -
 Makefile.am                                        |    7 +-
 configure.ac                                       |   56 +-
 contrib/.gitignore                                 |    1 -
 contrib/Makefile.am                                |   11 -
 contrib/conf/gnunet/no_autostart_above_core.conf   |    3 +
 contrib/conf/gnunet/no_forcestart.conf             |   16 +
 contrib/packages/guix/guix-env-gillmann.scm        |  151 ++
 contrib/packages/guix/guix-env-py2.scm             |  158 ++
 doc/documentation/Makefile.am                      |    6 +-
 doc/documentation/agpl-3.0.texi                    |  698 +++++
 doc/documentation/chapters/contributing.texi       |    6 +-
 doc/documentation/chapters/developer.texi          |  188 +-
 doc/documentation/chapters/installation.texi       | 2226 ++++++++++++++++
 .../chapters/{philosophy.texi => keyconcepts.texi} |  164 +-
 doc/documentation/chapters/philosophy.texi         |  446 +---
 doc/documentation/chapters/preface.texi            |   16 +-
 doc/documentation/chapters/user.texi               | 2785 +++-----------------
 doc/documentation/chapters/vocabulary.texi         |    2 +-
 doc/documentation/gnunet.texi                      |   51 +-
 doc/man/Makefile.am                                |    1 +
 doc/man/gnunet-gns.1                               |    2 +-
 doc/man/gnunet-revocation.1                        |    2 +-
 doc/man/gnunet-timeout.1                           |   20 +
 doc/release_policy.rfc.txt                         |    2 +-
 m4/ax_lib_postgresql.m4                            |    4 +-
 m4/iconv.m4                                        |    2 +-
 m4/lib-link.m4                                     |    2 +-
 m4/lib-prefix.m4                                   |    2 +-
 pkgconfig/Makefile.am                              |    3 -
 pkgconfig/gnunetdnsparser.pc.in                    |   12 -
 pkgconfig/gnunetdnsstub.pc.in                      |   12 -
 pkgconfig/gnunettun.pc.in                          |   12 -
 po/POTFILES.in                                     |  133 +-
 po/de.po                                           |    4 +-
 po/es.po                                           |   31 +-
 po/fr.po                                           |    2 +-
 po/sv.po                                           |    2 +-
 po/vi.po                                           |    2 +-
 po/zh_CN.po                                        |    2 +-
 src/Makefile.am                                    |    1 -
 src/arm/test_arm_api_data.conf                     |    2 +-
 src/ats/gnunet-service-ats_addresses.h             |    2 +-
 src/ats/plugin_ats_mlp.c                           |    1 +
 src/cadet/cadet.conf.in                            |    2 +-
 src/cadet/cadet.h                                  |   10 +
 src/cadet/cadet_api.c                              |  212 +-
 src/cadet/cadet_test_lib.c                         |    5 +
 src/cadet/gnunet-cadet.c                           |   82 +-
 src/cadet/gnunet-service-cadet.c                   |   64 +-
 src/cadet/gnunet-service-cadet_paths.c             |    2 +-
 src/cadet/gnunet-service-cadet_peer.c              |   47 +
 src/cadet/gnunet-service-cadet_peer.h              |   13 +
 src/consensus/gnunet-service-consensus.c           |    2 +-
 src/conversation/gnunet-conversation.c             |    9 +-
 src/core/core.h                                    |    2 +-
 src/core/gnunet-service-core.c                     |    2 +-
 src/core/gnunet-service-core.h                     |    2 +-
 src/core/gnunet-service-core_kx.c                  |    6 +-
 src/core/gnunet-service-core_sessions.c            |    2 +-
 src/core/gnunet-service-core_sessions.h            |    2 +-
 src/core/test_core_api_data.conf                   |    2 +-
 src/core/test_core_api_send_to_self.conf           |    2 +-
 src/datastore/perf_datastore_api.c                 |    2 +-
 src/datastore/plugin_datastore_mysql.c             |    2 +-
 src/dht/gnunet_dht_profiler.c                      |    4 +-
 src/dns/Makefile.am                                |   34 -
 src/dns/gnunet-zonewalk.c                          |   14 +-
 src/dv/test_transport_blacklist_data.conf          |    2 +-
 src/dv/test_transport_dv_data.conf                 |    2 +-
 src/exit/Makefile.am                               |    2 -
 src/fs/gnunet-service-fs_cp.h                      |    2 +-
 src/fs/test_fs_defaults.conf                       |    2 +-
 src/gns/Makefile.am                                |    6 -
 src/gns/gns_api.c                                  |    7 +-
 src/gns/gnunet-bcd.c                               |    3 +-
 src/gns/gnunet-dns2gns.c                           |    1 +
 src/gns/gnunet-gns.c                               |   10 +-
 src/gns/nss/nss_gns.c                              |  269 +-
 src/gns/nss/nss_gns_query.c                        |   25 +-
 src/gns/nss/nss_gns_query.h                        |   30 +-
 src/gnsrecord/Makefile.am                          |    2 -
 src/gnsrecord/gnsrecord_serialization.c            |    6 +
 src/gnsrecord/plugin_gnsrecord_dns.c               |    4 +-
 src/identity/identity_api_lookup.c                 |    8 +-
 src/include/block_dns.h                            |    2 +-
 src/include/gnunet_cadet_service.h                 |    4 +-
 src/include/gnunet_common.h                        |    4 +-
 src/include/gnunet_core_service.h                  |    2 +-
 src/include/gnunet_dnsparser_lib.h                 |   54 +-
 src/include/gnunet_dnsstub_lib.h                   |    3 +-
 src/include/gnunet_os_lib.h                        |    4 +-
 src/include/gnunet_psyc_service.h                  |    2 +-
 src/include/gnunet_secretsharing_service.h         |    4 +-
 src/include/gnunet_signatures.h                    |    2 +-
 src/include/gnunet_strings_lib.h                   |    8 +-
 src/include/gnunet_tun_lib.h                       |    3 +-
 src/include/gnunet_util_lib.h                      |    3 +
 src/multicast/gnunet-service-multicast.c           |    2 +-
 src/namestore/Makefile.am                          |    2 -
 src/namestore/gnunet-zoneimport.c                  |   15 +-
 src/namestore/plugin_namestore_flat.c              |   65 +-
 src/namestore/test_namestore_api_lookup_shadow.c   |    2 +-
 .../test_namestore_api_lookup_shadow_filter.c      |    2 +-
 src/namestore/test_namestore_api_sqlite.conf       |    1 +
 src/nat/gnunet-helper-nat-server.c                 |    3 +
 src/nat/test_nat_test_data.conf                    |    2 +-
 src/psyc/Makefile.am                               |    4 +-
 src/pt/Makefile.am                                 |    1 -
 src/regex/Makefile.am                              |    1 -
 src/rps/gnunet-rps-profiler.c                      |   19 +-
 src/rps/gnunet-rps.c                               |   17 +-
 src/rps/gnunet-service-rps.c                       |  129 +-
 src/rps/gnunet-service-rps_custommap.c             |    1 +
 src/rps/gnunet-service-rps_sampler.c               |    1 +
 src/rps/rps-test_util.c                            |   11 +-
 src/rps/test_rps.c                                 |   12 +
 src/secretsharing/gnunet-service-secretsharing.c   |    2 +-
 src/secretsharing/secretsharing_api.c              |    4 +-
 src/secretsharing/secretsharing_protocol.h         |    2 +-
 src/set/gnunet-service-set.h                       |    2 +-
 src/set/gnunet-service-set_intersection.c          |   23 +-
 src/set/gnunet-service-set_union.c                 |   23 +-
 src/template/template.conf                         |    6 +-
 src/testbed/test_testbed_api_statistics.conf       |    2 +-
 src/testing/test_testing_sharedservices.conf       |    2 +-
 src/topology/Makefile.am                           |    1 +
 src/topology/gnunet-daemon-topology.c              |    2 +-
 src/topology/test_gnunet_daemon_topology.c         |  229 +-
 src/transport/gnunet-service-transport.c           |    4 +-
 .../gnunet-service-transport_neighbours.c          |    4 +-
 src/transport/test_plugin_transport_data.conf      |   18 +-
 src/transport/test_quota_compliance_data.conf      |   12 +-
 ...est_quota_compliance_http_asymmetric_peer1.conf |   10 +-
 ...est_quota_compliance_http_asymmetric_peer2.conf |   12 +-
 .../test_quota_compliance_http_peer1.conf          |   10 +-
 .../test_quota_compliance_http_peer2.conf          |   12 +-
 ...st_quota_compliance_https_asymmetric_peer1.conf |   10 +-
 ...st_quota_compliance_https_asymmetric_peer2.conf |   12 +-
 .../test_quota_compliance_https_peer1.conf         |   10 +-
 .../test_quota_compliance_https_peer2.conf         |   12 +-
 ...test_quota_compliance_tcp_asymmetric_peer1.conf |   14 +-
 src/transport/test_quota_compliance_tcp_peer1.conf |   14 +-
 src/transport/test_quota_compliance_udp_peer1.conf |   12 +-
 src/transport/test_quota_compliance_udp_peer2.conf |   12 +-
 ...est_quota_compliance_unix_asymmetric_peer1.conf |   12 +-
 ...est_quota_compliance_unix_asymmetric_peer2.conf |   12 +-
 .../test_quota_compliance_unix_peer1.conf          |   10 +-
 .../test_quota_compliance_unix_peer2.conf          |   12 +-
 src/transport/test_transport_api_data.conf         |    4 +-
 ...st_transport_api_reliability_tcp_nat_peer1.conf |    2 +-
 .../test_transport_api_tcp_nat_peer1.conf          |    2 +-
 src/transport/transport.conf.in                    |    3 +-
 src/tun/.gitignore                                 |    2 -
 src/tun/Makefile.am                                |   46 -
 src/util/.gitignore                                |    4 +
 src/util/Makefile.am                               |   37 +-
 src/util/client.c                                  |   13 +-
 src/{dns => util}/dnsparser.c                      |  192 +-
 src/{dns => util}/dnsstub.c                        |    4 +-
 src/util/gnunet-config.c                           |   33 +-
 src/util/gnunet-service-resolver.c                 | 1173 ++++-----
 .../util/gnunet-timeout-w32.c                      |    6 +-
 .../util/gnunet-timeout.c                          |   82 +-
 src/util/os_priority.c                             |    6 +-
 src/{tun => util}/regex.c                          |    0
 src/util/resolver.h                                |    4 +-
 src/util/resolver_api.c                            |   26 +-
 src/util/strings.c                                 |   39 +-
 src/{dns => util}/test_hexcoder.c                  |    0
 src/{tun => util}/test_regex.c                     |    0
 src/{tun => util}/test_tun.c                       |    0
 src/{tun => util}/tun.c                            |    4 +-
 src/vpn/Makefile.am                                |    2 -
 174 files changed, 6030 insertions(+), 4716 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]