Merge fixes from dhcpcd-6 for authentication token algo.

author Roy Marples <roy@marples.name>

Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)

committer Roy Marples <roy@marples.name>

Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)
author Roy Marples <roy@marples.name>
Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)
committer Roy Marples <roy@marples.name>
Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)
diff --cc auth.c
Simple merge
diff --cc auth.h
Simple merge
diff --cc if-options.c
Simple merge
author	Roy Marples <roy@marples.name>
	Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)
committer	Roy Marples <roy@marples.name>
	Fri, 18 Nov 2016 13:51:50 +0000 (13:51 +0000)
		1	2
auth.c	patch \|	diff1 \|	diff2 \|	blob \| history
auth.h	patch \|	diff1 \|	diff2 \|	blob \| history
if-options.c	patch \|	diff1 \|	diff2 \|	blob \| history