Merge branch 'master' into int-new

diff --cc lib/Makefile
index a9aae66f931c8c6696f1b8cfafb8d24b471a21eb,0000000000000000000000000000000000000000..8e372bd31f4c5ba82c3387128ddb746d13676d77
mode 100644,000000..100644
--- 1/lib/Makefile
--- /dev/null
+++ b/lib/Makefile
@@@ -1,7 -1,0 +1,3 @@@
- src := bitops.c checksum.c ip.c lists.c md5.c net.c patmatch.c printf.c sha1.c sha256.c sha512.c slists.c xmalloc.c
- obj := $(src-o-files)
- $(all-client)
- 
 +src := bitops.c checksum.c event.c idm.c ip.c lists.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c tbf.c xmalloc.c
 +obj := $(src-o-files)
 +$(all-daemon)