From e402bfaa8148ef5c8414c69e68c7768c0d89ac19 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 8 Feb 2016 21:33:36 +0000
Subject: [PATCH] history for prop, -3

---
 history.txt                                       | 10 ++++++++++
 router/java/src/net/i2p/router/RouterVersion.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/history.txt b/history.txt
index 856e84e8c6..8a0c0a761c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2016-02-08 zzz
+ * BOB: Fix invalid output after getnick (ticket #1204)
+ * SAM v3.3:
+   - Add support for MASTER sessions
+   - Add support for per-packet optins SEND_TAGS, TAG_THRESHOLD, EXPIRES, and SEND_LEASESET
+   - Refactoring and cleanups
+   - Client test enhancements
+   - Fix bug receiving datagrams on v3 sessions with UTF-8 session IDs
+
 2016-02-03 zzz
 Prop from i2p.i2p.zzz.test2:
  * Build: More checks in release target
@@ -38,6 +47,7 @@ Prop from i2p.i2p.zzz.test2:
  * Jetty: Add gzip filter to eepsite Jetty (new installs only)
  * Random: Don't bother trying to seed from /dev/urandom on Windows
  * Router: Make network ID configurable
+ * Utils: New ArraySet implementation
 
 2016-02-01 zzz
  * Imagegen:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 282c18b422..0725033fa6 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 = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";