Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 17 Feb 2019 00:42:02 +0000 (00:42 +0000)
committerng0 <ng0@n0.is>
Sun, 17 Feb 2019 00:42:02 +0000 (00:42 +0000)

Trivial merge