[GNUnet-SVN] [gnunet] 07/45: Merge branch 'identity_abe' into identity_oidc

[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 28e046cf5376171ef86300fc1a0097f7e71cb1e6
Merge: c68eae71c 9e486ede0
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 7 13:03:07 2017 +0100

    Merge branch 'identity_abe' into identity_oidc

 src/cadet/gnunet-service-cadet_paths.c              |  5 +++--
 src/gns/gnunet-gns-proxy.c                          | 18 +++++++++++++++---
 src/set/gnunet-service-set_union.c                  |  7 +++----
 src/set/gnunet-service-set_union_strata_estimator.c |  6 ++----
 4 files changed, 23 insertions(+), 13 deletions(-)

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