From 5d7546598e9bd80fa54ff42f30d031cb509981f8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 9 Dec 2016 16:01:23 +0000
Subject: [PATCH] remove zerobin

---
 .../java/src/net/i2p/router/web/HomeHelper.java            | 2 +-
 history.txt                                                | 7 +++++--
 router/java/src/net/i2p/router/RouterVersion.java          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 1a61bac550..9e42e1ad83 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -58,7 +58,7 @@ public class HomeHelper extends HelperBase {
         //_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S +
         //"killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "television_delete.png" + S +
         _x("Free Web Hosting") + S + _x("Free eepsite hosting with PHP and MySQL") + S + "http://open4you.i2p/" + S + I + "open4you-logo.png" + S +
-        _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://zerobin.i2p/" + S + I + "paste_plain.png" + S +
+        //_x("Pastebin") + S + _x("I2P Pastebin") + S + "http://zerobin.i2p/" + S + I + "paste_plain.png" + S +
         _x("Planet I2P") + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "world.png" + S +
         _x("Plugins") + S + _x("Add-on directory") + S + "http://i2pwiki.i2p/index.php?title=Plugins" + S + I + "plugin.png" + S +
         _x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S +
diff --git a/history.txt b/history.txt
index 43c2b91d9e..16a88d10eb 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2016-12-09 zzz
+ * Translation updates
+
 2016-12-06 zzz
  * GeoIP: Update from Maxmind 2016-12-06
 
@@ -66,7 +69,7 @@
 
 2016-11-13 zzz
  * Console: Add initial news to bottom of news page (ticket #1153)
- * i2psnark: Periodically DHT nodes (ticket #1328)
+ * i2psnark: Periodically save DHT nodes (ticket #1328)
  * UPnP:
    - Prevent exception on bad HTTP header (ticket #1480)
    - Prevent NPE on socket creation fail (tickets #728, #1681)
@@ -100,7 +103,7 @@
  * Install: Add max memory option to runplain.sh
  * Crypto: Change serial number in selfsigned certs from int to long
  * Router: Fix low-memory log messages for non-wrapper (ticket #1795)
- * Transport: Improve IPv6 selection logic
+ * Transport: Improve IPv6 address selection logic
 
 2016-11-06 zzz
  * Console: Add Java 9 log warning (ticket #1870)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25340f779d..421ff4f630 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 = "-rc";