Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 12 Oct 2019 12:37:25 +0000 (14:37 +0200)
committerxrs <xrs@mail36.net>
Sat, 12 Oct 2019 12:37:25 +0000 (14:37 +0200)

Trivial merge