Includes removal of patches that are now integrated upstream. Signed-off-by: Ken Keys <kkeys@caida.org>