Conflicts:
	client/config_init.c
	client/fwknop.c
	lib/fko_decode.c
	lib/fko_rand_value.c
	server/incoming_spa.c
	test/test-fwknop.pl