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)
1  2 
src/cadet/gnunet-service-cadet.c
src/cadet/gnunet-service-cadet_peer.c

Simple merge
Simple merge