Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Fri, 8 Mar 2019 16:50:41 +0000 (16:50 +0000)
committerng0 <ng0@n0.is>
Fri, 8 Mar 2019 16:50:41 +0000 (16:50 +0000)

Trivial merge