gnunet-svn
[Top][All Lists]
Advanced

[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: Mon, 25 Jun 2018 16:53:36 +0200

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

xrs pushed a commit to branch master
in repository gnunet.

commit b96052f1d3b8bb05f1868bd809fcb6e4f6569a4c
Merge: 8405df1e1 1c9e2fc46
Author: xrs <address@hidden>
AuthorDate: Mon Jun 25 16:53:01 2018 +0200

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

 .gitignore                                         |   1 -
 configure.ac                                       |  57 +-
 .../logo/lynXified-amirouche-anonymous-v3.png      | Bin 0 -> 71137 bytes
 contrib/branding/logo/lynXified-amirouche-v3.svg   | 918 +++++++++++++++++++++
 contrib/packages/guix/guix-env-gillmann.scm        | 151 ++++
 contrib/packages/guix/guix-env-py2.scm             | 158 ++++
 doc/documentation/chapters/user.texi               |   6 +-
 doc/documentation/gnunet.texi                      |   8 +
 po/POTFILES.in                                     | 124 +--
 src/arm/test_arm_api_data.conf                     |   2 +-
 src/ats/ats_api_performance.c                      |   8 +-
 src/ats/plugin_ats_mlp.c                           |   1 +
 src/ats/plugin_ats_proportional.c                  |   2 +-
 src/cadet/cadet_test_lib.c                         |   5 +
 src/cadet/gnunet-cadet.c                           |   5 +
 src/core/test_core_api_data.conf                   |   2 +-
 src/core/test_core_api_send_to_self.conf           |   2 +-
 src/datastore/plugin_datastore_sqlite.c            |   3 +-
 src/dv/test_transport_blacklist_data.conf          |   2 +-
 src/dv/test_transport_dv_data.conf                 |   2 +-
 src/fs/fs_api.c                                    |   2 +-
 src/fs/gnunet-service-fs_pr.c                      |   2 +-
 src/fs/test_fs_defaults.conf                       |   2 +-
 src/gns/gnunet-gns-proxy.c                         |   2 +-
 src/gns/gnunet-service-gns_interceptor.c           |   2 +-
 src/gns/nss/nss_gns.c                              |   2 +-
 src/gnsrecord/gnsrecord_serialization.c            |  35 +-
 src/include/gnunet_common.h                        |   6 +
 src/multicast/gnunet-service-multicast.c           |   6 +
 src/namecache/gnunet-service-namecache.c           |  19 +-
 src/namecache/namecache_api.c                      |   8 +-
 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/test_nat_test_data.conf                    |   2 +-
 src/rps/gnunet-rps-profiler.c                      |  27 +-
 src/rps/gnunet-rps.c                               |  12 +-
 src/rps/rps-test_util.c                            |   5 +-
 src/rps/test_rps.conf                              |  23 +-
 src/template/template.conf                         |   6 +-
 src/testbed/test_testbed_api_statistics.conf       |   2 +-
 src/testbed/testbed_api_topology.c                 |   4 +-
 src/testing/test_testing_sharedservices.conf       |   2 +-
 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/util/Makefile.am                               |   3 +
 src/util/common_logging.c                          |   4 +
 src/util/disk.c                                    |  21 +-
 src/util/gnunet-service-resolver.c                 | 269 +++++-
 src/util/resolver.h                                |  27 +
 src/util/resolver_api.c                            |  37 +-
 src/util/test_resolver_api.c                       |   2 +
 71 files changed, 1923 insertions(+), 295 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]