[GNUnet-SVN] [gnunet] 13/45: -merge

[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 508784b4a98364d120448e132a046423ec78541f
Merge: c92893e0b 3fdb794b6
Author: Phil <address@hidden>
AuthorDate: Thu Dec 7 13:54:14 2017 +0000

    -merge

 src/cadet/gnunet-service-cadet_paths.c             |   5 +-
 src/gns/gnunet-gns-proxy.c                         |  18 ++++-
 src/identity-provider/logfile.txt                  |  73 +++++++++++++++++++++
 .../plugin_rest_identity_provider.c                |   8 +--
 src/identity-provider/vgcore.2692                  | Bin 0 -> 72450048 bytes
 src/set/gnunet-service-set_union.c                 |   7 +-
 .../gnunet-service-set_union_strata_estimator.c    |   6 +-
 7 files changed, 100 insertions(+), 17 deletions(-)


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