Merge branch 'chap-timeout' of https://github.com/nomis/ppp

author Paul Mackerras <paulus@ozlabs.org>

Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)

committer Paul Mackerras <paulus@ozlabs.org>

Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
author Paul Mackerras <paulus@ozlabs.org>
Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
committer Paul Mackerras <paulus@ozlabs.org>
Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
diff --cc pppd/chap-new.c
Simple merge
diff --cc pppd/pppd.8
Simple merge
author	Paul Mackerras <paulus@ozlabs.org>
	Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
committer	Paul Mackerras <paulus@ozlabs.org>
	Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
		1	2
pppd/chap-new.c	patch \|	diff1 \|	diff2 \|	blob \| history
pppd/pppd.8	patch \|	diff1 \|	diff2 \|	blob \| history