Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sat, 9 Mar 2019 18:42:04 +0000 (18:42 +0000)
committerng0 <ng0@n0.is>
Sat, 9 Mar 2019 18:42:04 +0000 (18:42 +0000)

Trivial merge