From 78b738528140cea0688339ec00a1a20c2e167469 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 22 Sep 2016 17:15:33 +0000
Subject: [PATCH] i2ptunnel: Whitelist IRC AWAY inbound

---
 .../java/src/net/i2p/i2ptunnel/irc/IRCFilter.java         | 3 ++-
 history.txt                                               | 8 ++++++++
 router/java/src/net/i2p/router/RouterVersion.java         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
index eef558837..c29adde1d 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
@@ -54,7 +54,8 @@ abstract class IRCFilter {
                 "AUTHENTICATE", // SASL, also requires CAP below
                 // http://tools.ietf.org/html/draft-mitchell-irc-capabilities-01
                 "CAP",
-                "PROTOCTL"
+                "PROTOCTL",
+                "AWAY"
         };
         
 
diff --git a/history.txt b/history.txt
index e68acf288..cbf06922f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2016-09-22 zzz
+ * Crypto: Don't NPE in encoding when field not set
+ * DataHelper: Fix read() for nonzero offset
+ * i2ptunnel: Whitelist IRC AWAY inbound
+
+2016-08-21 zzz
+ * Console: Add jsps to view entire router.log and wrapper.log files
+
 2016-08-19 zzz
  * CPUID: Add IDs for Kaby Lake
  * JettyStart: Fix main()
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2..5a58b19bc 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */
     public final static String EXTRA = "";