Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Thu, 25 Apr 2019 22:30:04 +0000 (22:30 +0000)
committerng0 <ng0@n0.is>
Thu, 25 Apr 2019 22:30:04 +0000 (22:30 +0000)

Trivial merge