Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Wed, 27 Nov 2019 18:01:12 +0000 (18:01 +0000)
committerng0 <ng0@n0.is>
Wed, 27 Nov 2019 18:01:12 +0000 (18:01 +0000)

Trivial merge