Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Mon, 2 Dec 2019 15:53:01 +0000 (15:53 +0000)
committerng0 <ng0@n0.is>
Mon, 2 Dec 2019 15:53:01 +0000 (15:53 +0000)

Trivial merge