Module Name: src
Committed By: christos
Date: Fri Feb 9 17:13:27 UTC 2018
fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/util.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.