[GNUnet-SVN] [gnunet] 02/171: Merge branch 'master' into credentials

[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 691aa85bfaec80c08330db772499a123b2ac2373
Merge: 39981eee3 ffc906fa7
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Nov 20 00:23:07 2016 +0100

    Merge branch 'master' into credentials

 guix-env.scm                                | 12 +++++-------
 src/ats/plugin_ats_ril.c                    |  2 +-
 src/cadet/gnunet-service-cadet_channel.c    |  8 ++++----
 src/cadet/gnunet-service-cadet_connection.c |  8 ++++----
 src/fragmentation/defragmentation.c         |  4 ++--
 src/fragmentation/fragmentation.c           | 20 ++++++++++++--------
 src/fs/fs_api.c                             |  4 ++--
 src/fs/fs_search.c                          |  4 ++--
 src/fs/gnunet-auto-share.c                  | 12 ++++++------
 src/fs/gnunet-service-fs_pr.c               |  2 +-
 src/include/gnunet_time_lib.h               | 12 ++++++++++++
 src/regex/gnunet-regex-profiler.c           |  2 +-
 src/rps/gnunet-service-rps.c                |  4 ++--
 src/util/Makefile.am                        |  2 +-
 src/util/bandwidth.c                        |  4 ++--
 src/util/client_new.c                       | 11 ++++++-----
 src/util/time.c                             | 26 ++++++++++++++++++++++++++
 src/vpn/vpn_api.c                           |  2 +-
 18 files changed, 90 insertions(+), 49 deletions(-)

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