Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Sun, 28 Apr 2013 02:26:38 +0000 (22:26 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 28 Apr 2013 02:26:38 +0000 (22:26 -0400)
commitdd05975217767104092189270f8470cca83df4e2
tree1bb6acec334ad20fd17cefd58a1ac3d72bcc7958
parent12a6e9e93a739494a985620619878a4a7983558c
parentb04de687ce6e9bcb43cb558dee6b2a5606e4d147
Merge remote-tracking branch 'fjoncourt/master'

This merges changes from Franck Joncourt for issues #55 (log module for fwknop)
and #64 (hostname resolution not working for -P icmp spoofing).
client/config_init.c
client/fwknop.c
client/spa_comm.c
test/test-fwknop.pl