Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 26 Oct 2019 13:04:41 +0000 (15:04 +0200)
committerxrs <xrs@mail36.net>
Sat, 26 Oct 2019 13:04:41 +0000 (15:04 +0200)

Trivial merge