[gnunet] 27/30: Merge branch 'master' into schanzen/reclaim_256bit

[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 3ea10b00b00ee045ce08f7f925c6811ecf359b3a
Merge: 15d3fe8a0 206866779
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Feb 12 23:09:35 2020 +0100

    Merge branch 'master' into schanzen/reclaim_256bit

 src/gns/gnunet-service-gns_resolver.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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