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

Trivial merge