Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 27 Oct 2019 17:30:26 +0000 (17:30 +0000)
committerng0 <ng0@n0.is>
Sun, 27 Oct 2019 17:30:26 +0000 (17:30 +0000)

Trivial merge