Merge branch 'fix_social' of gnunet.org:gnunet into fix_social