Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 1 Dec 2019 11:01:08 +0000 (11:01 +0000)
committerng0 <ng0@n0.is>
Sun, 1 Dec 2019 11:01:08 +0000 (11:01 +0000)

Trivial merge