[GNUnet-SVN] [gnunet] 10/14: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

xrs pushed a commit to branch master
in repository gnunet.

commit 7b1a069924c8b17b91cfc0185db767bdd9969338
Merge: 84405db3a 90c803401
Author: xrs <address@hidden>
AuthorDate: Sun Dec 3 21:08:32 2017 +0100

    Merge branch 'master' of ssh://gnunet.org/gnunet

 src/cadet/gnunet-service-cadet_paths.c              | 5 +++--
 src/set/gnunet-service-set_union.c                  | 7 +++----
 src/set/gnunet-service-set_union_strata_estimator.c | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

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