Merge branch 'master' of ssh://gnunet.org/gnunet
authort3sserakt <t3ss@posteo.de>
Wed, 27 Jun 2018 23:36:18 +0000 (01:36 +0200)
committert3sserakt <t3ss@posteo.de>
Wed, 27 Jun 2018 23:36:23 +0000 (01:36 +0200)
commitf4279d5bfd1e10fa668a262226cb159910f08680
treede9f0699a82498091a7a8189766edf4d7e6d8d8e
parentb294b0e78e44543024f19f197cbac39f86091b88
parent7540ebcd02d9bfe0a690689a1f57952eda5b5c81
Merge branch 'master' of ssh://gnunet.org/gnunet
src/cadet/gnunet-service-cadet.c
src/cadet/gnunet-service-cadet_peer.c