Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Wed, 3 Apr 2019 10:19:46 +0000 (10:19 +0000)
committerng0 <ng0@n0.is>
Wed, 3 Apr 2019 10:19:46 +0000 (10:19 +0000)

Trivial merge