Merge branch 'remove_protocol_specific_values_from_global_state_object' into 'master'

author Daniel Lenski <dlenski@gmail.com>

Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)

committer Daniel Lenski <dlenski@gmail.com>

Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)
author Daniel Lenski <dlenski@gmail.com>
Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)
committer Daniel Lenski <dlenski@gmail.com>
Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)
diff --cc library.c
Simple merge
diff --cc openconnect-internal.h
Simple merge
author	Daniel Lenski <dlenski@gmail.com>
	Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)
committer	Daniel Lenski <dlenski@gmail.com>
	Thu, 11 Feb 2021 17:20:53 +0000 (17:20 +0000)
		1	2
library.c	patch \|	diff1 \|	diff2 \|	blob \| history
openconnect-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history