Received: by mail.netbsd.org (Postfix, from userid 605)
	id 53A7284E51; Sun,  5 Apr 2020 21:53:46 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id CCCF184E50
	for <source-changes@NetBSD.org>; Sun,  5 Apr 2020 21:53:45 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id fRRsZRaSfuDL for <source-changes@netbsd.org>;
	Sun,  5 Apr 2020 21:53:45 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 69AB284CD5
	for <source-changes@NetBSD.org>; Sun,  5 Apr 2020 21:53:45 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 63315FB27; Sun,  5 Apr 2020 21:53:45 +0000 (UTC)
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
MIME-Version: 1.0
Date: Sun, 5 Apr 2020 17:53:45 -0400
From: "Christos Zoulas" <christos@netbsd.org>
Subject: CVS commit: src/crypto/external/bsd/openssl/dist
To: source-changes@NetBSD.org
X-Mailer: log_accum
Message-Id: <20200405215345.63315FB27@cvs.NetBSD.org>
Sender: source-changes-owner@NetBSD.org
List-Id: source-changes.NetBSD.org
Precedence: bulk
Reply-To: source-changes-d@NetBSD.org
Mail-Reply-To: "Christos Zoulas" <christos@netbsd.org>
Mail-Followup-To: source-changes-d@NetBSD.org
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20source-changes&body=unsubscribe%20source-changes>

Module Name:	src
Committed By:	christos
Date:		Sun Apr  5 21:53:45 UTC 2020

Modified Files:
	src/crypto/external/bsd/openssl/dist: CHANGES NEWS README
	src/crypto/external/bsd/openssl/dist/apps: s_server.c
	src/crypto/external/bsd/openssl/dist/crypto: ex_data.c
	src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
	src/crypto/external/bsd/openssl/dist/ssl: ssl_err.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssl/dist/CHANGES \
    src/crypto/external/bsd/openssl/dist/NEWS \
    src/crypto/external/bsd/openssl/dist/README
cvs rdiff -u -r1.22 -r1.23 \
    src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssl/dist/crypto/ex_data.c
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.