Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Tue, 19 Nov 2019 17:33:36 +0000 (17:33 +0000)
committerng0 <ng0@n0.is>
Tue, 19 Nov 2019 17:33:36 +0000 (17:33 +0000)

Trivial merge