gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] 24/45: Merge remote-tracking branch 'origin/master


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 24/45: Merge remote-tracking branch 'origin/master' into identity_oidc
Date: Sun, 25 Feb 2018 16:25:28 +0100

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

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

commit f2d31fb82a314dcf6819dd494ff4a11e4f871c4e
Merge: 9f5ea1f7f 3f52ce03c
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Mon Jan 8 10:49:06 2018 +0100

    Merge remote-tracking branch 'origin/master' into identity_oidc

 .mailmap                                           |   26 +
 AUTHORS                                            |    2 +
 Makefile.am                                        |    3 +-
 README                                             |    9 +-
 README.1st                                         |  255 +++
 configure.ac                                       |   17 +-
 Dockerfile => contrib/Dockerfile                   |   11 +-
 .../docker-entrypoint.sh                           |    0
 contrib/packages/guix/README                       |   47 +-
 contrib/packages/guix/gnunet-doc.scm               |    2 +-
 contrib/packages/guix/gnunet.scm                   |    2 +-
 contrib/packages/guix/guix-env.scm                 |    2 +-
 doc/Makefile.am                                    |    4 +-
 doc/documentation/.gitignore                       |    2 +
 doc/documentation/Makefile.am                      |   79 +-
 doc/documentation/README.txt                       |   46 +-
 doc/documentation/chapters/contributing.texi       |   14 +-
 doc/documentation/chapters/developer.texi          |   22 +-
 doc/documentation/chapters/installation.texi       |   67 +-
 doc/documentation/chapters/philosophy.texi         |  137 +-
 doc/documentation/chapters/user.texi               |    6 +-
 doc/documentation/gnunet-c-tutorial.texi           |    2 +
 doc/documentation/gnunet.texi                      |   27 +-
 doc/documentation/index.html                       |   14 +-
 doc/doxygen/Makefile.am                            |    3 +
 po/POTFILES.in                                     |  122 +-
 po/de.po                                           | 1732 +++++++++----------
 po/es.po                                           | 1748 +++++++++----------
 po/fr.po                                           | 1611 ++++++++----------
 po/sv.po                                           | 1708 +++++++++----------
 po/vi.po                                           | 1694 +++++++++---------
 po/zh_CN.po                                        | 1612 ++++++++----------
 src/Makefile.am                                    |   16 +-
 src/abe/Makefile.am                                |   47 +
 src/abe/abe.c                                      |  499 ++++++
 src/{util/test_crypto_abe.c => abe/test_cpabe.c}   |   13 +-
 src/arm/gnunet-service-arm.c                       |    3 +-
 src/auction/Makefile.am                            |    5 +
 src/cadet/cadet_api.c                              |  127 +-
 src/cadet/cadet_test_lib.c                         |    1 +
 src/cadet/gnunet-cadet.c                           |    1 +
 src/cadet/gnunet-service-cadet_core.c              |   42 +-
 src/cadet/gnunet-service-cadet_paths.c             |  169 +-
 src/cadet/gnunet-service-cadet_peer.c              |    2 +-
 src/cadet/gnunet-service-cadet_tunnels.c           |    4 +-
 src/cadet/test_cadet.c                             |  133 +-
 .../gnunet-helper-audio-playback-gst.c             |    5 +
 src/conversation/gnunet-helper-audio-playback.c    |    5 +
 src/conversation/gnunet_gst.c                      |    5 +
 src/conversation/microphone.c                      |    4 +-
 src/core/gnunet-service-core.c                     |    3 +
 src/core/gnunet-service-core_kx.c                  |    5 +-
 src/core/gnunet-service-core_sessions.c            |   19 +-
 src/credential/credential.h                        |    2 +-
 src/credential/credential_api.c                    |   18 +-
 src/credential/credential_misc.c                   |    4 +-
 src/credential/credential_serialization.c          |   14 +-
 src/credential/gnunet-credential.c                 |   23 +-
 src/credential/gnunet-service-credential.c         |  130 +-
 src/credential/plugin_gnsrecord_credential.c       |   12 +-
 src/credential/plugin_rest_credential.c            |   59 +-
 src/credential/test_credential_verify_simple.sh    |    8 +-
 src/curl/curl.c                                    |    3 +-
 src/datacache/plugin_datacache_postgres.c          |    8 +
 src/dht/Makefile.am                                |    1 +
 src/dht/gnunet-service-dht.c                       |    1 -
 src/dns/dnsparser.c                                |   28 +-
 src/fs/fs_dirmetascan.c                            |   32 +-
 src/fs/fs_download.c                               |    3 +-
 src/fs/fs_search.c                                 |   19 +-
 src/fs/fs_uri.c                                    |   25 +-
 src/fs/gnunet-download.c                           |  145 +-
 src/fs/test_fs_download_persistence.c              |    1 -
 src/fs/test_fs_publish_persistence.c               |    1 -
 src/gns/gnunet-dns2gns.c                           |   45 +-
 src/gns/gnunet-service-gns_resolver.c              |   66 +-
 src/hello/hello.c                                  |    7 +
 src/identity-attribute/identity_attribute.c        |    8 +-
 src/identity-attribute/identity_attribute.h        |    4 +-
 .../plugin_identity_attribute_gnuid.c              |    2 +-
 src/identity-provider/Makefile.am                  |    1 +
 src/identity-provider/gnunet-idp.c                 |    5 +-
 .../gnunet-service-identity-provider.c             |  310 ++--
 src/identity-provider/identity_provider.h          |    8 +-
 src/identity-provider/identity_provider_api.c      |   41 +-
 .../plugin_gnsrecord_identity_provider.c           |    4 +-
 .../plugin_identity_provider_sqlite.c              |    4 +-
 .../plugin_rest_identity_provider.c                |   11 -
 src/identity/plugin_rest_identity.c                |   11 +-
 src/include/Makefile.am                            |    7 +
 src/include/gnunet_abe_lib.h                       |  193 +++
 src/include/gnunet_common.h                        |   15 +-
 src/include/gnunet_credential_service.h            |   33 +-
 src/include/gnunet_crypto_lib.h                    |   82 -
 src/include/gnunet_fs_service.h                    |    3 +-
 src/include/gnunet_identity_attribute_lib.h        |    2 +-
 src/include/gnunet_identity_provider_service.h     |   19 +-
 src/include/gnunet_mst_lib.h                       |    4 +-
 src/include/gnunet_network_lib.h                   |    8 +-
 src/include/gnunet_protocols.h                     |   30 +-
 src/include/gnunet_rest_lib.h                      |    6 +-
 src/include/gnunet_rest_plugin.h                   |    2 +-
 src/include/gnunet_scheduler_lib.h                 |   44 +-
 src/include/gnunet_service_lib.h                   |    7 +-
 src/include/gnunet_set_service.h                   |    3 +
 src/jsonapi/Makefile.am                            |    2 +-
 src/jsonapi/test_jsonapi.c                         |   36 +-
 src/multicast/Makefile.am                          |    2 +-
 src/multicast/gnunet-service-multicast.c           |  249 ++-
 src/multicast/multicast_api.c                      |   51 +-
 src/multicast/test_multicast_multipeer.c           |  312 ++--
 src/nat/gnunet-nat.c                               |   12 +-
 src/nse/gnunet-nse-profiler.c                      |   19 +-
 src/peerinfo/gnunet-service-peerinfo.c             |   71 +-
 src/psyc/gnunet-service-psyc.c                     |  131 +-
 src/psyc/psyc_api.c                                |  103 +-
 src/psyc/test_psyc.c                               |   28 +-
 src/psyc/test_psyc.conf                            |   16 +
 src/psycstore/psycstore_api.c                      |   13 +-
 src/regex/regex_internal_dht.c                     |   29 +-
 src/regex/regex_test_lib.c                         |   23 +-
 src/rest/Makefile.am                               |    2 +
 src/revocation/gnunet-service-revocation.c         |    9 +-
 src/rps/.gitignore                                 |   12 +
 src/rps/Makefile.am                                |   15 +-
 src/rps/gnunet-service-rps.c                       | 1798 +++++++++++++++++++-
 src/rps/gnunet-service-rps_peers.c                 | 1694 ------------------
 src/rps/gnunet-service-rps_peers.h                 |  437 -----
 src/rps/rps.h                                      |   96 ++
 src/rps/test_rps.c                                 |  298 +++-
 src/rps/test_rps.conf                              |   38 +-
 src/rps/test_service_rps_peers.c                   |  137 --
 src/set/Makefile.am                                |    2 +-
 src/set/gnunet-service-set_union.c                 |   13 +-
 src/set/set_api.c                                  |    5 +-
 src/social/gnunet-service-social.c                 |  845 ++++-----
 src/social/gnunet-social.c                         |   26 +-
 src/social/social_api.c                            |  292 ++--
 src/social/test_social.c                           |  268 +--
 src/social/test_social.conf                        |   19 +
 src/statistics/gnunet-service-statistics.c         |    4 +-
 src/testbed/Makefile.am                            |    2 +-
 src/testbed/gnunet-daemon-testbed-blacklist.c      |    4 +-
 src/testbed/gnunet-daemon-testbed-underlay.c       |    6 +-
 src/testbed/gnunet-helper-testbed.c                |    7 +-
 src/testbed/gnunet-service-testbed_oc.c            |   15 +-
 src/testbed/gnunet-testbed-profiler.c              |   15 +-
 src/transport/Makefile.am                          |    9 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |    6 +
 src/transport/gnunet-service-transport.c           |    4 +-
 src/transport/gnunet-service-transport_ats.c       |   10 +-
 .../gnunet-service-transport_neighbours.c          |   54 +-
 .../gnunet-service-transport_validation.c          |   13 +
 src/transport/plugin_transport_http_server.c       |    2 +-
 src/transport/plugin_transport_tcp.c               |   17 +-
 src/transport/plugin_transport_udp.c               |   11 +-
 src/transport/tcp_connection_legacy.c              |    9 +-
 src/transport/tcp_server_legacy.c                  |   24 +-
 src/util/Makefile.am                               |   23 -
 src/util/bio.c                                     |   69 +-
 src/util/client.c                                  |   44 +-
 src/util/common_allocation.c                       |   32 +-
 src/util/common_logging.c                          |   54 +-
 src/util/configuration.c                           |   39 +-
 src/util/container_bloomfilter.c                   |   60 +-
 src/util/crypto_ecc.c                              |    4 +-
 src/util/crypto_ecc_dlog.c                         |    1 +
 src/util/crypto_ecc_setup.c                        |   98 +-
 src/util/crypto_hash.c                             |    6 +-
 src/util/crypto_hash_file.c                        |   16 +-
 src/util/disk.c                                    |   27 +-
 src/util/getopt_helpers.c                          |   79 +-
 src/util/gnunet-config.c                           |   61 +-
 src/util/gnunet-ecc.c                              |   35 +-
 src/util/gnunet-resolver.c                         |   30 +-
 src/util/gnunet-service-resolver.c                 |   10 +-
 src/util/mq.c                                      |   22 +
 src/util/mst.c                                     |   27 +-
 src/util/network.c                                 |   94 +-
 src/util/os_installation.c                         |   23 +-
 src/util/os_priority.c                             |    1 +
 src/util/peer.c                                    |    3 +-
 src/util/program.c                                 |   13 +-
 src/util/resolver_api.c                            |   24 +-
 src/util/scheduler.c                               | 1565 ++++++++++-------
 src/util/service.c                                 |   35 +-
 src/util/speedup.c                                 |    1 +
 src/util/strings.c                                 |   10 +-
 src/util/test_service.c                            |   39 +-
 src/util/time.c                                    |    2 +-
 src/vpn/gnunet-helper-vpn.c                        |    1 +
 src/vpn/gnunet-service-vpn.c                       |    3 +
 192 files changed, 12429 insertions(+), 11093 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]