[gnunet] 28/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 967128436023d0a7364dfe8b661d6cd4542d6a96
Merge: 3ea10b00b aa26736c4
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Feb 13 07:59:48 2020 +0100

    Merge branch 'master' into schanzen/reclaim_256bit

 src/gns/gnunet-service-gns_resolver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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