Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 15 Dec 2019 12:02:56 +0000 (12:02 +0000)
committerng0 <ng0@n0.is>
Sun, 15 Dec 2019 12:02:56 +0000 (12:02 +0000)

Trivial merge