Merge tag 'upstream/1.6.0'

Upstream version 1.6.0

Merge tag 'upstream/1.6.0'
Upstream version 1.6.0
9ad165c5 · Arturo Borrero Gonzalez · 7f04bf74 · 615f9fca · 9ad165c5 · 9ad165c5
Commit 9ad165c5 authored Dec 21, 2015 by Arturo Borrero Gonzalez
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
--- a/extensions/libipt_unclean.man
+++ b/extensions/libipt_unclean.man
-This module takes no options, but attempts to match packets which seem
-malformed or unusual.  This is regarded as experimental.
--- a/extensions/libxt_CLASSIFY.c
+++ b/extensions/libxt_CLASSIFY.c
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
--- a/extensions/libxt_CT.c
+++ b/extensions/libxt_CT.c
--- a/extensions/libxt_CT.man
+++ b/extensions/libxt_CT.man
--- a/extensions/libxt_SET.c
+++ b/extensions/libxt_SET.c
--- a/extensions/libxt_SET.man
+++ b/extensions/libxt_SET.man
--- a/extensions/libxt_SNAT.man
+++ b/extensions/libxt_SNAT.man
--- a/extensions/libxt_SYNPROXY.man
+++ b/extensions/libxt_SYNPROXY.man
--- a/extensions/libxt_TEE.c
+++ b/extensions/libxt_TEE.c
--- a/extensions/libxt_cgroup.c
+++ b/extensions/libxt_cgroup.c
--- a/extensions/libxt_cgroup.man
+++ b/extensions/libxt_cgroup.man
--- a/extensions/libxt_connlabel.c
+++ b/extensions/libxt_connlabel.c
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
--- a/extensions/libxt_devgroup.c
+++ b/extensions/libxt_devgroup.c
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
--- a/extensions/libxt_ipcomp.c
+++ b/extensions/libxt_ipcomp.c