Ansis Atteka (1):
      tests: conntrackd: fix compile errors and warnings

Jozsef Kadlecsik (2):
      conntrackd: RPC helper added to cthelper
      conntrackd: TNS helper added to cthelper

Nicolas Dichtel (1):
      build: fix libraries dependencies in Makefiles

Pablo Neira Ayuso (14):
      conntrack: add support for stats dumping via ctnetlink
      conntrack: -C uses ctnetlink instead of /proc/sys/net/netfilter/nf_conntrack_count
      conntrackd: generalize file descriptor infrastructure
      conntrackd: move ctnetlink code to ctnl.c (removed from run.c)
      conntrackd: add cthelper infrastructure (+ example FTP helper)
      tests: conntrackd: add cthelper-test infrastructure
      nfct: helper: use CONNTRACKD_LIB_DIR variable set during configuration
      cthelper: disable debugging information by default
      cthelper: ftp: fix EPRT case for IPv4
      conntrackd: parse: fix wrong maximum length for ATTR_EXP_FN
      conntrackd: cthelper: add QueueLen option
      conntrackd: fix crash if ExpectationSync is enabled on old Linux kernels
      doc: detail user-space helper support
      bump version to 1.4.0 and update dependencies

Vincent Bernat (1):
      conntrackd: don't resync expectations if such sync has been disabled