Merge branch 'master' of ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 30 Nov 2019 19:28:01 +0000 (20:28 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 30 Nov 2019 19:28:01 +0000 (20:28 +0100)

Trivial merge