[GNUnet-SVN] [gnunet] 164/171: Merge remote-tracking branch 'origin/master' into identity_abe

[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 9e486ede076d2139b1c655411ce9560d9baf6984
Merge: 6e0922fc2 513c56ddc
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Dec 5 17:27:33 2017 +0100

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

 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