From 23de1e6db8767d4306641ab58db622ea6b7fb7f7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 16 Jan 2012 14:10:06 +0000
Subject: [PATCH] -4

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

diff --git a/history.txt b/history.txt
index 0ca887885c..da999adc4b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,19 @@
+2012-01-16 zzz
+  * Build: Put Implementation-Version in manifests
+  * NetDB: Hopefully fix rare NPE (ticket #589)
+  * Plugins:
+    - Only stop a plugin before update if it was running
+    - Only stop a plugin at shutdown if it was running
+    - Don't start a plugin after update if it was disabled
+    - Disable plugin if it fails version checks at startup
+    - Auto-update plugins after a router update
+    - Add update-all button and more cancel buttons
+  * Router:
+    - Add synchronized change-and-save-config methods to avoid races
+    - Save previous version in config so we know when we updated
+  * Transport: Revert change from -2, put addresses back in RouterInfo
+               when hidden, broke inbound tunnel building
+
 2012-01-14 zzz
   * i2ptunnel: Partial fix for dest formatting (ticket #581)
   * jars.jsp: New debug page
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa6..f6e6df3a5c 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 = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";