Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Wed, 23 Oct 2019 20:27:00 +0000 (20:27 +0000)
committerng0 <ng0@n0.is>
Wed, 23 Oct 2019 20:27:00 +0000 (20:27 +0000)

Trivial merge