Merge branch 'master' of gitlab.com:openconnect/openconnect

author David Woodhouse <dwmw2@infradead.org>

Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)

committer David Woodhouse <dwmw2@infradead.org>

Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)
author David Woodhouse <dwmw2@infradead.org>
Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)
committer David Woodhouse <dwmw2@infradead.org>
Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)
diff --cc auth.c
Simple merge
diff --cc gnutls.c
Simple merge
diff --cc main.c
Simple merge
author	David Woodhouse <dwmw2@infradead.org>
	Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)
committer	David Woodhouse <dwmw2@infradead.org>
	Tue, 12 Apr 2022 13:07:34 +0000 (15:07 +0200)
		1	2
auth.c	patch \|	diff1 \|	diff2 \|	blob \| history
gnutls.c	patch \|	diff1 \|	diff2 \|	blob \| history
main.c	patch \|	diff1 \|	diff2 \|	blob \| history