Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 5 Sep 2019 05:13:06 +0000 (07:13 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 5 Sep 2019 05:13:06 +0000 (07:13 +0200)

Trivial merge