Merge tag 'upstream/1.6.0+snapshot20161117'

Upstream version 1.6.0+snapshot20161117

Merge tag 'upstream/1.6.0+snapshot20161117'
Upstream version 1.6.0+snapshot20161117
dd6b25de · Arturo Borrero Gonzalez · 8fceaf37 · 7b095084 · dd6b25de · dd6b25de
Commit dd6b25de authored Nov 17, 2016 by Arturo Borrero Gonzalez
--- a/extensions/libxt_NFLOG.man
+++ b/extensions/libxt_NFLOG.man
--- a/extensions/libxt_NFLOG.t
+++ b/extensions/libxt_NFLOG.t
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
--- a/extensions/libxt_NFQUEUE.t
+++ b/extensions/libxt_NFQUEUE.t
--- a/extensions/libxt_NOTRACK.t
+++ b/extensions/libxt_NOTRACK.t
--- a/extensions/libxt_RATEEST.t
+++ b/extensions/libxt_RATEEST.t
--- a/extensions/libxt_SET.t
+++ b/extensions/libxt_SET.t
--- a/extensions/libxt_SYNPROXY.t
+++ b/extensions/libxt_SYNPROXY.t
--- a/extensions/libxt_TCPMSS.t
+++ b/extensions/libxt_TCPMSS.t
--- a/extensions/libxt_TCPOPTSTRIP.c
+++ b/extensions/libxt_TCPOPTSTRIP.c
--- a/extensions/libxt_TCPOPTSTRIP.t
+++ b/extensions/libxt_TCPOPTSTRIP.t
--- a/extensions/libxt_TEE.c
+++ b/extensions/libxt_TEE.c
--- a/extensions/libxt_TEE.t
+++ b/extensions/libxt_TEE.t
--- a/extensions/libxt_TOS.t
+++ b/extensions/libxt_TOS.t
--- a/extensions/libxt_TPROXY.t
+++ b/extensions/libxt_TPROXY.t
--- a/extensions/libxt_TRACE.c
+++ b/extensions/libxt_TRACE.c
--- a/extensions/libxt_TRACE.t
+++ b/extensions/libxt_TRACE.t
--- a/extensions/libxt_addrtype.t
+++ b/extensions/libxt_addrtype.t
--- a/extensions/libxt_bpf.man
+++ b/extensions/libxt_bpf.man
--- a/extensions/libxt_bpf.t
+++ b/extensions/libxt_bpf.t