Afschin Hormozdiary (1): libnetfilter_conntrack: don't ignore ATTR_CONNLABELS Florian Westphal (18): api: add nfct_bitmask object api: add connlabel api and attribute examples: add connlabel dump/set/clear demo programs api: add CTA_LABEL_MASK attribute handling qa: add api test for nfct_cmp and nfct_exp functions conntrack, expect: fix _cmp api with STRICT checking expect: consider all expect attributes when comparing conntrack: nfct_cmp: also compare labels qa: nfct_cmp: verify individual attr comparision connlabel: fix NULL deref on malloc failure conntrack: CONNLABELS are not a nested attribute conntrack: connlabel: remove useless test conntrack: labels: skip labels with non-alnum characters src: callback: fix memory leak when ct has dynamically allocated attr conntrack: api: add nfct_snprintf_labels qa: test_connlabel: don't abort when system-wide config exists conntrack: labels: labelmap_new: make sure errno is 0 when no labels are found build: bump version to 1.0.4