Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 22 Jun 2019 20:58:04 +0000 (22:58 +0200)
committerxrs <xrs@mail36.net>
Sat, 22 Jun 2019 20:58:04 +0000 (22:58 +0200)

Trivial merge