[gnunet] 06/06: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

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

t3sserakt pushed a commit to branch master
in repository gnunet.

commit 4887fa044a7792d367b0cf9d48b3d6d3b0adfd17
Merge: 72cb328c6 38e90f057
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Mon Aug 31 09:24:07 2020 +0200

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

 src/consensus/consensus_protocol.h       |   1 +
 src/consensus/gnunet-service-consensus.c | 552 ++++++++++++++++---------------
 src/consensus/plugin_block_consensus.c   |  13 +-
 src/include/gnunet_crypto_lib.h          |   2 +-
 src/util/crypto_hash.c                   |   2 +-
 5 files changed, 295 insertions(+), 275 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.