Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 27 Oct 2019 16:47:40 +0000 (17:47 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 27 Oct 2019 16:47:40 +0000 (17:47 +0100)

Trivial merge