Merge branch 'master' of ssh://git.gnunet.org/gnunet