Rediffed patches for merge fuzz

This commit is contained in:
Brent Cook
2018-11-07 20:00:29 -06:00
parent 34394e7ee0
commit 11bb39ecf6
6 changed files with 39 additions and 40 deletions

1
.gitignore vendored
View File

@@ -126,6 +126,7 @@ include/openssl/*.h
/apps/ocspcheck/*.c
/apps/ocspcheck/ocspcheck*
/apps/ocspcheck/compat/memmem.c
/apps/ocspcheck/compat/inet_ntop.c
/apps/nc/*.h
/apps/nc/*.c