christos 4054ffb031 merge conflicts

2015-07-03 00:59:59 +00:00

..

dist/ipsec-tools

Detect error earlier to avoid memory leak.

2015-05-19 15:16:00 +00:00

external

merge conflicts

2015-07-03 00:59:59 +00:00

Makefile.openssl

…

TODO

…