Aaron Thompson (1):
      conntrackd: cthelper: ssdp: Fix parsing of IPv6 M-SEARCH requests.

Adam Casella (1):
      conntrackd: cache: fix zone entry uniqueness in external cache

Arturo Borrero Gonzalez (8):
      .gitignore: add nano swap file
      conntrackd: external_inject: report inject issues as warning
      conntrackd: introduce yes & no config values
      tests: introduce new python-based framework for running tests
      tests: introduce some basic testcases for the new conntrack-tools testing framework
      tests: introduce replicating scenario and simple icmp test case
      tests: conntrackd: add testcase for missing hashtable buckets and max entries
      tests: conntrackd: silence sysctl

Florian Westphal (8):
      conntrack: add support for CLASH_RESOLVED counter
      conntrack: pretty-print the portid
      conntrack: enable kernel-based status filtering with -L -u STATUS
      conntrack: add shorthand mnemonic for UNREPLIED
      conntrack: add support for chaintoolong stat counter
      conntrack: fix compiler warnings
      conntrack: remove -o userspace
      conntrack: unbreak event mode

Jeremy Sowden (9):
      build: remove commented-out macros from configure.ac
      build: quote AC_INIT arguments
      build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT`
      build: remove yacc-generated header from EXTRA_DIST
      build: clean yacc- and lex-generated files with maintainer-clean
      build: fix dependency-tracking of yacc-generated header
      build: only require bison and flex if the generated files do not exist
      build: remove MAINTAINERCLEANFILES
      build: replace `AM_PROG_LEX` with `AC_PROG_LEX`

Mikhail Sennikovsky (20):
      tests: icmp entry create/delete
      conntrack: fix icmp entry creation
      conntrack: implement save output format
      conntrack.8: man update for opts format support
      conntrack: accept commands from file
      conntrack.8: man update for --load-file support
      tests: saving and loading ct entries, save format
      tests: conntrack -L/-D ip family filtering
      tests/conntrack: script for stress-testing ct load
      conntrack: pass sock to nfct_mnl_*() functions
      conntrack: use libmnl for updating conntrack table
      conntrack: use libmnl for ct entries deletion
      conntrack: use libmnl for flushing conntrack table
      conntrack: use same modifier socket for bulk ops
      conntrack: set reply l4 proto for unknown protocol
      conntrack: fix protocol number parsing
      conntrack: fix -o save dump for unknown protocols
      conntrack: generalize command parsing
      conntrack: use C99 initializer syntax for option map
      conntrack: introduce new -A command

Pablo Neira Ayuso (45):
      conntrack: add support for the IPS_HW_OFFLOAD flag
      conntrack: add a few more tests
      doc: manual: fix conntrack examples
      doc: manual: refer to nf_conntrack sysctl
      doc: manual: general documentation revamp
      conntrack: default to unspec family for dualstack setups
      conntrack: allow to filter event by family
      conntrack: allow to flush per family
      conntrackd: add ip netns test script
      conntrack: add struct ct_cmd
      conntrack: add struct ct_tmpl
      conntrack: add do_command_ct()
      tests: conntrackd: move basic netns scenario setup to shell script
      conntrackd: set default hashtable buckets and max entries if not specified
      conntrack: pass command object to callbacks
      conntrack: pass ct_cmd to nfct_filter_init()
      conntrack: pass cmd to nfct_filter()
      conntrack: pass cmd to filter nat, mark and network functions
      conntrack: move options flag to ct_cmd object
      conntrack: add function to print command stats
      conntrack: release options after parsing
      conntrackd: fix endianness bug in IPv4 and IPv6 address
      conntrackd: cthelper: Set up userspace helpers when daemon starts
      doc: manual: Document userspace helper configuration at daemon startup
      conntrackd: cthelper: fix overlapping queue numbers in example file
      src: conntrackd: add #include <linux/netfilter/nfnetlink_queue.h>
      doc: add cluster match script
      conntrackd: do not include conntrack ID in hashtable cmp
      conntrack: pass filter_dump object to nfct_mnl_dump()
      conntrack: enhance mnl_nfct_dump_cb()
      conntrack: use libmnl for listing conntrack table
      conntrack: add nfct_mnl_talk() and nfct_mnl_recv() helper functions
      conntrack: add netlink flags to nfct_mnl_nlmsghdr_put()
      conntrack: use libmnl to create entry
      conntrack: rename nfct_mnl_recv() to __nfct_mnl_dump()
      conntrack: add nfct_mnl_request()
      nfct: remove lazy binding
      conntrack: consolidate socket open call
      conntrackd: build: always add ports to sync message
      conntrack: pass command object to nfct_mnl_request()
      conntrack: update CT_GET to use libmnl
      conntrack: update manpage with new -A command
      conntrack: use IPPROTO_RAW
      conntrack: slightly simplify parse_proto_num() by using strtoul()
      conntrack-tools 1.4.7 release

Phil Sutter (9):
      hash: Flush tables when destroying
      cache: Fix features array allocation
      Fix potential buffer overrun in snprintf() calls
      helpers: ftp: Avoid ugly casts
      read_config_yy: Drop extra argument from dlog() call
      Don't call exit() from signal handler
      Drop pointless assignments
      connntrack: Fix for memleak when parsing -j arg
      local: Avoid sockaddr_un::sun_path buffer overflow

Yi Yang (1):
      conntrack: fix zone sync issue

Štěpán Němec (1):
      conntrack.8: minor copy edit