From 5b285db1654725ffc2339fd4c37fe7d8944a31d2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 18 Jan 2012 18:38:20 +0000
Subject: [PATCH] -5

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

diff --git a/history.txt b/history.txt
index ae56a2a4b3..19bf8e7aa8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,15 @@
+2012-01-18 zzz
+  * I2PTunnel: Register ports with the PortMapper
+  * Router:
+    - Use new synchronized change-and-save-config methods
+      to eliminate races with ReadConfigJob
+  * Tunnels:
+    - When a peer is shitlisted, fail all our tunnels where
+      that peer is the adjacent hop. In particular this
+      will remove outbound tunnels when we can't contact
+      the first hop, and enable quicker recovery.
+  * Update: Find the proxy port in the PortMapper
+
 2012-01-16 hottuna
   * Router:
     - Don't throttle tunnel creation if using a higher
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5c..4e28a2c8d2 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 = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";