Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Wed, 13 Feb 2019 21:53:41 +0000 (21:53 +0000)
committerng0 <ng0@n0.is>
Wed, 13 Feb 2019 21:53:41 +0000 (21:53 +0000)

Trivial merge