Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 21 Jun 2019 20:48:45 +0000 (22:48 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 21 Jun 2019 20:48:45 +0000 (22:48 +0200)

Trivial merge