[GNUnet-SVN] [gnunet] 76/171: Merge remote-tracking branch 'origin/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 ecb0ab123eca06cf982d388e69d1c6ddca3f9672
Merge: 315cdad26 696ca66c2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu May 18 13:13:09 2017 +0200

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

 doc/gnunet-c-tutorial.tex               |   2 +-
 doc/structure.dot                       | 177 ++---------------
 guix-env.scm                            |  24 +--
 src/include/gnunet_scheduler_lib.h      |  10 +-
 src/regex/gnunet-daemon-regexprofiler.c |   2 +-
 src/regex/gnunet-regex-profiler.c       | 134 ++++++++++---
 src/regex/perf-regex.c                  |  15 +-
 src/regex/regex_test_lib.c              | 336 ++++++++++++++++++++++++++------
 src/regex/regex_test_lib.h              |  10 +-
 src/sq/Makefile.am                      |   3 +-
 10 files changed, 432 insertions(+), 281 deletions(-)

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