Merge branch 'chap-timeout' of https://github.com/nomis/ppp
authorPaul Mackerras <paulus@ozlabs.org>
Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Tue, 29 Dec 2020 23:45:55 +0000 (10:45 +1100)
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1  2 
pppd/chap-new.c
pppd/pppd.8

diff --cc pppd/chap-new.c
Simple merge
diff --cc pppd/pppd.8
Simple merge