Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Thu, 18 Apr 2019 16:28:21 +0000 (16:28 +0000)
committerng0 <ng0@n0.is>
Thu, 18 Apr 2019 16:28:21 +0000 (16:28 +0000)

Trivial merge