[GNUnet-SVN] [gnunet] 110/171: Merge remote-tracking branch 'origin/master' into identity_abe

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 02c92c69ab4193b81ac6f90b52fecb40b94b9208
Merge: b6755fe23 6bcc73a1c
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Aug 3 19:21:28 2017 +0900

    Merge remote-tracking branch 'origin/master' into identity_abe

 configure.ac                                       |  47 -----
 src/fs/gnunet-search.c                             |   2 +-
 src/fs/test_gnunet_fs_psd.py.in                    |   6 +-
 src/gns/Makefile.am                                |   2 -
 src/gns/nss/Makefile.am                            |  26 +--
 src/gns/nss/install-nss-plugin.sh                  |   8 -
 src/gns/nss/uninstall-nss-plugin.sh                |   8 -
 src/include/gnunet_common.h                        |  15 ++
 src/multicast/Makefile.am                          |  17 +-
 src/multicast/gnunet-service-multicast.c           |  24 +--
 src/multicast/test_multicast.conf                  |  11 +-
 ...est_multicast.conf => test_multicast_line.conf} |  18 +-
 src/multicast/test_multicast_multipeer.c           | 195 ++++++++++++---------
 ...est_multicast.conf => test_multicast_star.conf} |  17 +-
 src/util/Makefile.am                               |   8 +-
 src/util/common_logging.c                          |  21 +++
 src/util/resolver_api.c                            |  85 +++++----
 17 files changed, 272 insertions(+), 238 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
address@hidden