Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 21 Apr 2019 20:09:20 +0000 (20:09 +0000)
committerng0 <ng0@n0.is>
Sun, 21 Apr 2019 20:09:20 +0000 (20:09 +0000)

Trivial merge