Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Mon, 29 Apr 2019 13:01:19 +0000 (13:01 +0000)
committerng0 <ng0@n0.is>
Mon, 29 Apr 2019 13:01:19 +0000 (13:01 +0000)

Trivial merge