Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Thu, 16 Jan 2020 16:12:09 +0000 (17:12 +0100)
committerxrs <xrs@mail36.net>
Thu, 16 Jan 2020 16:12:09 +0000 (17:12 +0100)

Trivial merge