[GNUnet-SVN] [gnunet] 13/13: Merge branch 'cadet-new-options'

[gnunet]

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

t3sserakt pushed a commit to branch master
in repository gnunet.

commit f096bdce8eaeaabc42f2a015bf29c422b3d25719
Merge: dfeef02bf 160edc412
Author: t3sserakt <address@hidden>
AuthorDate: Sun Jul 21 20:18:24 2019 +0200

    Merge branch 'cadet-new-options'

 src/cadet/cadet_api.c                              |   25 +-
 src/cadet/gnunet-cadet-profiler.c                  |    7 +-
 src/cadet/gnunet-cadet.c                           |    3 -
 src/cadet/gnunet-service-cadet_channel.c           |  574 ++---
 src/cadet/gnunet-service-cadet_connection.c        |  282 +--
 src/cadet/gnunet-service-cadet_connection.h        |    5 -
 src/cadet/gnunet-service-cadet_core.c              |  513 ++--
 src/cadet/gnunet-service-cadet_tunnels.c           |    3 -
 src/cadet/gnunet-service-cadet_tunnels.h           |    2 -
 src/cadet/test_cadet.c                             |    7 -
 src/cadet/test_cadet_local_mq.c                    |    1 -
 src/conversation/gnunet-service-conversation.c     |  415 ++--
 src/fs/gnunet-service-fs_cadet_client.c            |  243 +-
 src/include/gnunet_cadet_service.h                 |   58 +-
 src/include/gnunet_mq_lib.h                        |   20 +-
 src/pt/gnunet-daemon-pt.c                          |    1 -
 src/rps/gnunet-service-rps.c                       |    1 -
 .../gnunet-service-scalarproduct-ecc_alice.c       |  360 ++-
 .../gnunet-service-scalarproduct_alice.c           |  376 ++-
 src/set/gnunet-service-set.c                       |  771 +++---
 src/util/mq.c                                      |   22 +
 src/vpn/gnunet-service-vpn.c                       | 2484 ++++++++++----------
 22 files changed, 2726 insertions(+), 3447 deletions(-)

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