Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Wed, 25 Dec 2019 14:50:16 +0000 (15:50 +0100)
committerChristian Grothoff <christian@grothoff.org>
Wed, 25 Dec 2019 14:50:16 +0000 (15:50 +0100)

Trivial merge