[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit 9f722a29b9f7abbb9d8d1de63a72d09588c02f91
Merge: c7e032816 dd8289771
Author: Nils Gillmann <address@hidden>
AuthorDate: Thu May 17 13:39:09 2018 +0000

    Merge branch 'master' of gnunet.org:gnunet

 contrib/testing_hostkeys.ecc             | Bin 131072 -> 131072 bytes
 src/cadet/gnunet-service-cadet_tunnels.c | 339 ++++++++++++++++++-------------
 src/dns/.gitignore                       |   1 +
 src/gns/gnunet-gns-benchmark.c           |   2 +-
 src/gns/gnunet-gns-proxy.c               |  34 ++++
 src/gns/gnunet-service-gns.c             |  19 +-
 src/include/gnunet_common.h              |  70 ++++++-
 src/rps/test_rps.c                       |  42 ++--
 src/util/Makefile.am                     |   3 +-
 src/util/common_logging.c                | 100 +++++++++
 src/util/crypto_bug.c                    |  79 +++++++
 src/util/crypto_ecc.c                    | 171 ++++++++--------
 src/util/crypto_ecc_setup.c              |  14 +-
 src/util/test_crypto_ecdh_eddsa.c        |  52 +++--
 src/util/test_crypto_ecdhe.c             |  25 ++-
 15 files changed, 665 insertions(+), 286 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden