[GNUnet-SVN] [gnunet] 21/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social

[gnunet]

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

lurchi pushed a commit to branch master
in repository gnunet.

commit bf2169967b3c5a4a553c133a00dd7d35289f7a9d
Merge: ea5102e5e 7c1ce9a71
Author: t3sserakt <address@hidden>
AuthorDate: Thu Nov 2 18:15:13 2017 +0100

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

 src/cadet/gnunet-service-cadet_tunnels.c           |  4 +-
 .../gnunet-helper-audio-playback-gst.c             |  5 ++
 src/conversation/gnunet-helper-audio-playback.c    |  5 ++
 src/conversation/gnunet_gst.c                      |  5 ++
 src/conversation/microphone.c                      |  4 +-
 src/core/gnunet-service-core.c                     |  3 +
 src/core/gnunet-service-core_kx.c                  |  3 +
 src/fs/fs_dirmetascan.c                            |  3 +
 src/include/gnunet_mst_lib.h                       |  4 +-
 src/include/gnunet_service_lib.h                   |  7 +-
 src/psyc/psyc_api.c                                | 21 +++--
 src/social/gnunet-service-social.c                 | 34 ++++----
 src/social/social_api.c                            |  3 +
 src/social/test_social.c                           | 91 ++++++++++++++--------
 src/social/test_social.conf                        |  3 +
 src/statistics/gnunet-service-statistics.c         |  4 +-
 src/testbed/gnunet-helper-testbed.c                |  7 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |  6 ++
 src/transport/plugin_transport_http_server.c       |  2 +-
 src/transport/tcp_server_legacy.c                  | 20 +----
 src/util/client.c                                  |  8 +-
 src/util/mq.c                                      | 15 +++-
 src/util/mst.c                                     | 27 +++++--
 src/util/scheduler.c                               | 18 ++---
 src/util/service.c                                 |  6 +-
 src/vpn/gnunet-service-vpn.c                       |  3 +
 26 files changed, 207 insertions(+), 104 deletions(-)


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