Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 23 Jul 2019 15:21:30 +0000 (17:21 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 23 Jul 2019 15:21:30 +0000 (17:21 +0200)

Trivial merge