From 4203259e5a44a659df10db06cf9d31b33b768cb5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 3 Jun 2011 16:45:29 +0200
Subject: [PATCH] Xtables-addons 1.36

---
 configure.ac        | 2 +-
 doc/changelog.txt   | 8 ++++++++
 xtables-addons.8.in | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 16525fc..ff0e171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([xtables-addons], [1.35])
+AC_INIT([xtables-addons], [1.36])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 2a6dabe..9d9996b 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,8 +1,16 @@
 
 HEAD
 ====
+
+
+v1.36 (2011-06-03)
+==================
 Changes:
 - xt_geoip: avoid recursive function calls
+- xt_TARPIT: unlock for use in all tables
+- xt_TARPIT: honeypot and reset modes
+- update to ipset 6.7
+- support for Linux 3.0
 
 
 v1.35 (2011-04-11)
diff --git a/xtables-addons.8.in b/xtables-addons.8.in
index 1fc3aab..a6d73a3 100644
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "v1.32 (2011-01-04)" "" "v1.32 (2011-01-04)"
+.TH xtables-addons 8 "v1.36 (2011-06-03)" "" "v1.36 (2011-06-03)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets