Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 29 Nov 2019 08:30:35 +0000 (09:30 +0100)
committerxrs <xrs@mail36.net>
Fri, 29 Nov 2019 08:30:35 +0000 (09:30 +0100)

Trivial merge