Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Tue, 23 Apr 2019 14:50:21 +0000 (14:50 +0000)
committerng0 <ng0@n0.is>
Tue, 23 Apr 2019 14:50:21 +0000 (14:50 +0000)

Trivial merge