[GNUnet-SVN] [gnunet] 100/171: -merge

[gnunet]

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

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

commit 0e13b88e8f727543317f80757646606bf8269983
Merge: 32b2ebbdc cfc492f5d
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Jul 9 19:25:54 2017 +0200

    -merge

 src/include/gnunet_crypto_lib.h |  4 ++++
 src/util/crypto_abe.c           | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

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