Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Fri, 3 Apr 2020 12:19:03 +0000 (14:19 +0200)
committerChristian Grothoff <christian@grothoff.org>
Fri, 3 Apr 2020 12:19:03 +0000 (14:19 +0200)

Trivial merge