merge of '63ea1d70b3fd3886a050d7b196cd7ae261844164'

     and '6a57f7039fe5697b9770d642ac1d4653e4b9878c'

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 28;
+    public final static long BUILD = 29;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

@@ -570,8 +570,8 @@ public class TunnelDispatcher implements Service {
             long maxTime = before + MAX_FUTURE_EXPIRATION;
             if ( (msg.getMessageExpiration() < minTime) || (msg.getMessage().getMessageExpiration() < minTime) ||
                  (msg.getMessageExpiration() > maxTime) || (msg.getMessage().getMessageExpiration() > maxTime) ) {
-                if (_log.shouldLog(Log.ERROR))
-                    _log.error("Not dispatching a gateway message for tunnel " + msg.getTunnelId().getTunnelId()
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Not dispatching a gateway message for tunnel " + msg.getTunnelId().getTunnelId()
                                + " as the wrapper's expiration is in " + DataHelper.formatDuration(msg.getMessageExpiration()-before)
                                + " and/or the content's expiration is in " + DataHelper.formatDuration(msg.getMessage().getMessageExpiration()-before)
                                + " with messageId " + msg.getUniqueId() + "/" + msg.getMessage().getUniqueId() + " and message type "