From 4250f78ddfff3301ede73fa6730dc01fdf49a431 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 20 Dec 2015 14:33:24 +0000
Subject: [PATCH] javadoc fix, bump

---
 .../src/net/i2p/router/web/ConfigServiceHandler.java   |  2 +-
 history.txt                                            | 10 ++++++++++
 router/java/src/net/i2p/router/RouterVersion.java      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 9193c87314..d1431361f7 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -155,7 +155,7 @@ public class ConfigServiceHandler extends FormHandler {
 
     /**
      *  Register a handler for signals,
-     *  so we can handle HUP from the wrapper (non-Windows only, wrapper 3.2.0 or higher)
+     *  so we can handle HUP from the wrapper (wrapper 3.2.0 or higher)
      *
      *  @since 0.8.13
      */
diff --git a/history.txt b/history.txt
index 3bf3fe85a1..185feeb26c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,13 @@
+2015-12-20 zzz
+ * BuildHandler: Additional fixes (ticket #1738)
+ * CertUtil: Add methods to export private keys
+ * Console: Sybil tool enhancementsrivate keys
+ * Transports:
+   - Disconnect faster when first message is a
+     tunnel build request which we reject
+   - Display SSU sent/received messages, not packets,
+     on /peers to be consistent with NTCP
+
 2015-12-18 zzz
  * BuildHandler: Fix NPE (ticket #1738)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index ea17ad55f3..e1f87e077d 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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "";
-- 
GitLab