Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 3 Jul 2017 08:31:57 +0000 (10:31 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 3 Jul 2017 08:31:57 +0000 (10:31 +0200)
1  2 
src/exit/gnunet-daemon-exit.c

Simple merge