From 633fabb09e79c1e30db820ea9aceb00a58c3f719 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 3 Aug 2006 22:34:24 +0000
Subject: [PATCH] 2006-08-03  jrandom     * Decrease the recently modified
 tunnel building timeout, though keep       the scaling on their processing

---
 history.txt                                          | 12 +++++++++++-
 router/java/src/net/i2p/router/RouterVersion.java    |  4 ++--
 .../net/i2p/router/tunnel/pool/BuildRequestor.java   |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/history.txt b/history.txt
index 6fb3a5605..4642cc18d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,14 @@
-$Id: history.txt,v 1.503 2006-07-29 13:03:16 jrandom Exp $
+$Id: history.txt,v 1.504 2006-07-30 00:08:20 complication Exp $
+
+2006-08-03  jrandom
+    * Decrease the recently modified tunnel building timeout, though keep
+      the scaling on their processing
+
+2006-07-31  jrandom
+    * Increase the tunnel building timeout
+    * Avoid a rare race (thanks bar!)
+    * Fix the bandwidth capacity publishing code to factor in share percentage
+      and outbound throttling (oops)
 
 2006-07-29  Complication
     * Treat NTP responses from unexpected stratums like failures
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0ca220fe3..a2344e756 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.443 $ $Date: 2006-07-30 00:08:23 $";
+    public final static String ID = "$Revision: 1.444 $ $Date: 2006-07-31 21:26:56 $";
     public final static String VERSION = "0.6.1.24";
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
index 251ce3ce6..d1eb1e077 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
@@ -22,7 +22,7 @@ class BuildRequestor {
             ORDER.add(new Integer(i));
     }
     private static final int PRIORITY = 500;
-    static final int REQUEST_TIMEOUT = 20*1000;
+    static final int REQUEST_TIMEOUT = 10*1000;
     
     private static boolean usePairedTunnels(RouterContext ctx) {
         String val = ctx.getProperty("router.usePairedTunnels");