diff --git a/history.txt b/history.txt
index d44b0bac8..048585b51 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,28 @@
+2009-09-04 zzz
+    * SessionKeyManager, OCMOSJ, Garlic:
+      - Enable per-client SessionKeyManagers for better anonymity
+      - tagsDelivered() now means tags are sent, not acked.
+      - OCMOSJ uses the new TagSetHandle object returned from tagsDelivered()
+        to call tagsAcked() or failTags() as appropriate.
+      - Assume tags delivered on an established session to
+        reduce streaming lib stalls caused by massive tag deliveries;
+        should increase throughput and window sizes on long-lived streams
+      - Unacked tagsets on a new session are stored on a separate list
+      - Don't kill an OB Session just because it's temporarily out of tags
+      - Increase min tag threshold to 30 (was 20) due to new speculative
+        tags delivered scheme, and to increase effective max window
+      - More Java 5 and dead code cleanups, and more comments and javadoc,
+        debug logging cleanups
+      - Key toString()s for easier debugging
+      - HandleGarlicMessageJob: cleanup of unused things
+    * Tunnel TestJob:
+      - Consume the tag after a failed test so it doesn't
+        stay in the SKM
+      - Disable tests with router.disableTunnelTesting=true
+    * configkeyring.jsp: Add delete and cancel buttons
+    * Logging: Fix directory for rotated log
+    * TunnelDispatcher: Cleanup
+
 2009-09-02 sponge
     * Small logic fix for dr|z3d
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4c8aefc89..40028c0e0 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 = 18;
+    public final static long BUILD = 19;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java
new file mode 100644
index 000000000..810b29c4f
--- /dev/null
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java
@@ -0,0 +1,225 @@
+package net.i2p.router.networkdb.kademlia;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.i2p.data.Hash;
+import net.i2p.data.i2np.DatabaseLookupMessage;
+import net.i2p.data.i2np.DatabaseSearchReplyMessage;
+import net.i2p.data.i2np.DatabaseStoreMessage;
+import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.router.Job;
+import net.i2p.router.JobImpl;
+import net.i2p.router.MessageSelector;
+import net.i2p.router.OutNetMessage;
+import net.i2p.router.ReplyJob;
+import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
+
+/**
+ * Try sending a search to some floodfill peers, but if we don't get a successful
+ * match within half the allowed lookup time, give up and start querying through
+ * the normal (kademlia) channels.  This should cut down on spurious lookups caused
+ * by simple delays in responses from floodfill peers
+ *
+ */
+public class FloodSearchJob extends JobImpl {
+    private Log _log;
+    private FloodfillNetworkDatabaseFacade _facade;
+    private Hash _key;
+    private final List _onFind;
+    private final List _onFailed;
+    private long _expiration;
+    private int _timeoutMs;
+    private long _origExpiration;
+    private boolean _isLease;
+    private volatile int _lookupsRemaining;
+    private volatile boolean _dead;
+    public FloodSearchJob(RouterContext ctx, FloodfillNetworkDatabaseFacade facade, Hash key, Job onFind, Job onFailed, int timeoutMs, boolean isLease) {
+        super(ctx);
+        _log = ctx.logManager().getLog(FloodSearchJob.class);
+        _facade = facade;
+        _key = key;
+        _onFind = new ArrayList();
+        _onFind.add(onFind);
+        _onFailed = new ArrayList();
+        _onFailed.add(onFailed);
+        int timeout = -1;
+        timeout = timeoutMs / FLOOD_SEARCH_TIME_FACTOR;
+        if (timeout < timeoutMs)
+            timeout = timeoutMs;
+        _timeoutMs = timeout;
+        _expiration = timeout + ctx.clock().now();
+        _origExpiration = timeoutMs + ctx.clock().now();
+        _isLease = isLease;
+        _lookupsRemaining = 0;
+        _dead = false;
+    }
+    void addDeferred(Job onFind, Job onFailed, long timeoutMs, boolean isLease) {
+        if (_dead) {
+            getContext().jobQueue().addJob(onFailed);
+        } else {
+            if (onFind != null) synchronized (_onFind) { _onFind.add(onFind); }
+            if (onFailed != null) synchronized (_onFailed) { _onFailed.add(onFailed); }
+        }
+    }
+    public long getExpiration() { return _expiration; }
+    private static final int CONCURRENT_SEARCHES = 2;
+    private static final int FLOOD_SEARCH_TIME_FACTOR = 2;
+    private static final int FLOOD_SEARCH_TIME_MIN = 30*1000;
+    public void runJob() {
+        // pick some floodfill peers and send out the searches
+        List floodfillPeers = _facade.getFloodfillPeers();
+        FloodLookupSelector replySelector = new FloodLookupSelector(getContext(), this);
+        ReplyJob onReply = new FloodLookupMatchJob(getContext(), this);
+        Job onTimeout = new FloodLookupTimeoutJob(getContext(), this);
+        OutNetMessage out = getContext().messageRegistry().registerPending(replySelector, onReply, onTimeout, _timeoutMs);
+
+        for (int i = 0; _lookupsRemaining < CONCURRENT_SEARCHES && i < floodfillPeers.size(); i++) {
+            Hash peer = (Hash)floodfillPeers.get(i);
+            if (peer.equals(getContext().routerHash()))
+                continue;
+            
+            DatabaseLookupMessage dlm = new DatabaseLookupMessage(getContext(), true);
+            TunnelInfo replyTunnel = getContext().tunnelManager().selectInboundTunnel();
+            TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundTunnel();
+            if ( (replyTunnel == null) || (outTunnel == null) ) {
+                _dead = true;
+                List removed = null;
+                synchronized (_onFailed) {
+                    removed = new ArrayList(_onFailed);
+                    _onFailed.clear();
+                }
+                while (removed.size() > 0)
+                    getContext().jobQueue().addJob((Job)removed.remove(0));
+                getContext().messageRegistry().unregisterPending(out);
+                return;
+            }
+            dlm.setFrom(replyTunnel.getPeer(0));
+            dlm.setMessageExpiration(getContext().clock().now()+10*1000);
+            dlm.setReplyTunnel(replyTunnel.getReceiveTunnelId(0));
+            dlm.setSearchKey(_key);
+            
+            if (_log.shouldLog(Log.INFO))
+                _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " to " + peer.toBase64());
+            getContext().tunnelDispatcher().dispatchOutbound(dlm, outTunnel.getSendTunnelId(0), peer);
+            _lookupsRemaining++;
+        }
+        
+        if (_lookupsRemaining <= 0) {
+            if (_log.shouldLog(Log.INFO))
+                _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " had no peers to send to");
+            // no floodfill peers, go to the normal ones
+            getContext().messageRegistry().unregisterPending(out);
+            _facade.searchFull(_key, _onFind, _onFailed, _timeoutMs*FLOOD_SEARCH_TIME_FACTOR, _isLease);
+        }
+    }
+    public String getName() { return "NetDb search (phase 1)"; }
+    
+    Hash getKey() { return _key; }
+    void decrementRemaining() { _lookupsRemaining--; }
+    int getLookupsRemaining() { return _lookupsRemaining; }
+    
+    void failed() {
+        if (_dead) return;
+        _dead = true;
+        int timeRemaining = (int)(_origExpiration - getContext().clock().now());
+        if (_log.shouldLog(Log.INFO))
+            _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " failed with " + timeRemaining);
+        if (timeRemaining > 0) {
+            _facade.searchFull(_key, _onFind, _onFailed, timeRemaining, _isLease);
+        } else {
+            List removed = null;
+            synchronized (_onFailed) {
+                removed = new ArrayList(_onFailed);
+                _onFailed.clear();
+            }
+            while (removed.size() > 0)
+                getContext().jobQueue().addJob((Job)removed.remove(0));
+        }
+    }
+    void success() {
+        if (_dead) return;
+        if (_log.shouldLog(Log.INFO))
+            _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " successful");
+        _dead = true;
+        _facade.complete(_key);
+        List removed = null;
+        synchronized (_onFind) {
+            removed = new ArrayList(_onFind);
+            _onFind.clear();
+        }
+        while (removed.size() > 0)
+            getContext().jobQueue().addJob((Job)removed.remove(0));
+    }
+
+    private static class FloodLookupTimeoutJob extends JobImpl {
+        private FloodSearchJob _search;
+        public FloodLookupTimeoutJob(RouterContext ctx, FloodSearchJob job) {
+            super(ctx);
+            _search = job;
+        }
+        public void runJob() {
+            _search.decrementRemaining();
+            if (_search.getLookupsRemaining() <= 0)
+                _search.failed(); 
+        }
+        public String getName() { return "NetDb search (phase 1) timeout"; }
+    }
+
+    private static class FloodLookupMatchJob extends JobImpl implements ReplyJob {
+        private Log _log;
+        private FloodSearchJob _search;
+        public FloodLookupMatchJob(RouterContext ctx, FloodSearchJob job) {
+            super(ctx);
+            _log = ctx.logManager().getLog(FloodLookupMatchJob.class);
+            _search = job;
+        }
+        public void runJob() { 
+            if ( (getContext().netDb().lookupLeaseSetLocally(_search.getKey()) != null) ||
+                 (getContext().netDb().lookupRouterInfoLocally(_search.getKey()) != null) ) {
+                _search.success();
+            } else {
+                int remaining = _search.getLookupsRemaining();
+                if (_log.shouldLog(Log.INFO))
+                    _log.info(getJobId() + "/" + _search.getJobId() + ": got a reply looking for " 
+                              + _search.getKey().toBase64() + ", with " + remaining + " outstanding searches");
+                // netDb reply pointing us at other people
+                if (remaining <= 0)
+                    _search.failed();
+            }
+        }
+        public String getName() { return "NetDb search (phase 1) match"; }
+        public void setMessage(I2NPMessage message) {}
+    }
+
+    private static class FloodLookupSelector implements MessageSelector {
+        private RouterContext _context;
+        private FloodSearchJob _search;
+        public FloodLookupSelector(RouterContext ctx, FloodSearchJob search) {
+            _context = ctx;
+            _search = search;
+        }
+        public boolean continueMatching() { return _search.getLookupsRemaining() > 0; }
+        public long getExpiration() { return _search.getExpiration(); }
+        public boolean isMatch(I2NPMessage message) {
+            if (message == null) return false;
+            if (message instanceof DatabaseStoreMessage) {
+                DatabaseStoreMessage dsm = (DatabaseStoreMessage)message;
+                // is it worth making sure the reply came in on the right tunnel?
+                if (_search.getKey().equals(dsm.getKey())) {
+                    _search.decrementRemaining();
+                    return true;
+                }
+            } else if (message instanceof DatabaseSearchReplyMessage) {
+                DatabaseSearchReplyMessage dsrm = (DatabaseSearchReplyMessage)message;
+                if (_search.getKey().equals(dsrm.getSearchKey())) {
+                    _search.decrementRemaining();
+                    return true;
+                }
+            }
+            return false;
+        }   
+    }
+}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index 3772b18d1..2b8659c69 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -351,210 +351,3 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
         }
     }
 }
-
-/**
- * Try sending a search to some floodfill peers, but if we don't get a successful
- * match within half the allowed lookup time, give up and start querying through
- * the normal (kademlia) channels.  This should cut down on spurious lookups caused
- * by simple delays in responses from floodfill peers
- *
- */
-class FloodSearchJob extends JobImpl {
-    private Log _log;
-    private FloodfillNetworkDatabaseFacade _facade;
-    private Hash _key;
-    private final List _onFind;
-    private final List _onFailed;
-    private long _expiration;
-    private int _timeoutMs;
-    private long _origExpiration;
-    private boolean _isLease;
-    private volatile int _lookupsRemaining;
-    private volatile boolean _dead;
-    public FloodSearchJob(RouterContext ctx, FloodfillNetworkDatabaseFacade facade, Hash key, Job onFind, Job onFailed, int timeoutMs, boolean isLease) {
-        super(ctx);
-        _log = ctx.logManager().getLog(FloodSearchJob.class);
-        _facade = facade;
-        _key = key;
-        _onFind = new ArrayList();
-        _onFind.add(onFind);
-        _onFailed = new ArrayList();
-        _onFailed.add(onFailed);
-        int timeout = -1;
-        timeout = timeoutMs / FLOOD_SEARCH_TIME_FACTOR;
-        if (timeout < timeoutMs)
-            timeout = timeoutMs;
-        _timeoutMs = timeout;
-        _expiration = timeout + ctx.clock().now();
-        _origExpiration = timeoutMs + ctx.clock().now();
-        _isLease = isLease;
-        _lookupsRemaining = 0;
-        _dead = false;
-    }
-    void addDeferred(Job onFind, Job onFailed, long timeoutMs, boolean isLease) {
-        if (_dead) {
-            getContext().jobQueue().addJob(onFailed);
-        } else {
-            if (onFind != null) synchronized (_onFind) { _onFind.add(onFind); }
-            if (onFailed != null) synchronized (_onFailed) { _onFailed.add(onFailed); }
-        }
-    }
-    public long getExpiration() { return _expiration; }
-    private static final int CONCURRENT_SEARCHES = 2;
-    private static final int FLOOD_SEARCH_TIME_FACTOR = 2;
-    private static final int FLOOD_SEARCH_TIME_MIN = 30*1000;
-    public void runJob() {
-        // pick some floodfill peers and send out the searches
-        List floodfillPeers = _facade.getFloodfillPeers();
-        FloodLookupSelector replySelector = new FloodLookupSelector(getContext(), this);
-        ReplyJob onReply = new FloodLookupMatchJob(getContext(), this);
-        Job onTimeout = new FloodLookupTimeoutJob(getContext(), this);
-        OutNetMessage out = getContext().messageRegistry().registerPending(replySelector, onReply, onTimeout, _timeoutMs);
-
-        for (int i = 0; _lookupsRemaining < CONCURRENT_SEARCHES && i < floodfillPeers.size(); i++) {
-            Hash peer = (Hash)floodfillPeers.get(i);
-            if (peer.equals(getContext().routerHash()))
-                continue;
-            
-            DatabaseLookupMessage dlm = new DatabaseLookupMessage(getContext(), true);
-            TunnelInfo replyTunnel = getContext().tunnelManager().selectInboundTunnel();
-            TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundTunnel();
-            if ( (replyTunnel == null) || (outTunnel == null) ) {
-                _dead = true;
-                List removed = null;
-                synchronized (_onFailed) {
-                    removed = new ArrayList(_onFailed);
-                    _onFailed.clear();
-                }
-                while (removed.size() > 0)
-                    getContext().jobQueue().addJob((Job)removed.remove(0));
-                getContext().messageRegistry().unregisterPending(out);
-                return;
-            }
-            dlm.setFrom(replyTunnel.getPeer(0));
-            dlm.setMessageExpiration(getContext().clock().now()+10*1000);
-            dlm.setReplyTunnel(replyTunnel.getReceiveTunnelId(0));
-            dlm.setSearchKey(_key);
-            
-            if (_log.shouldLog(Log.INFO))
-                _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " to " + peer.toBase64());
-            getContext().tunnelDispatcher().dispatchOutbound(dlm, outTunnel.getSendTunnelId(0), peer);
-            _lookupsRemaining++;
-        }
-        
-        if (_lookupsRemaining <= 0) {
-            if (_log.shouldLog(Log.INFO))
-                _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " had no peers to send to");
-            // no floodfill peers, go to the normal ones
-            getContext().messageRegistry().unregisterPending(out);
-            _facade.searchFull(_key, _onFind, _onFailed, _timeoutMs*FLOOD_SEARCH_TIME_FACTOR, _isLease);
-        }
-    }
-    public String getName() { return "NetDb search (phase 1)"; }
-    
-    Hash getKey() { return _key; }
-    void decrementRemaining() { _lookupsRemaining--; }
-    int getLookupsRemaining() { return _lookupsRemaining; }
-    
-    void failed() {
-        if (_dead) return;
-        _dead = true;
-        int timeRemaining = (int)(_origExpiration - getContext().clock().now());
-        if (_log.shouldLog(Log.INFO))
-            _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " failed with " + timeRemaining);
-        if (timeRemaining > 0) {
-            _facade.searchFull(_key, _onFind, _onFailed, timeRemaining, _isLease);
-        } else {
-            List removed = null;
-            synchronized (_onFailed) {
-                removed = new ArrayList(_onFailed);
-                _onFailed.clear();
-            }
-            while (removed.size() > 0)
-                getContext().jobQueue().addJob((Job)removed.remove(0));
-        }
-    }
-    void success() {
-        if (_dead) return;
-        if (_log.shouldLog(Log.INFO))
-            _log.info(getJobId() + ": Floodfill search for " + _key.toBase64() + " successful");
-        _dead = true;
-        _facade.complete(_key);
-        List removed = null;
-        synchronized (_onFind) {
-            removed = new ArrayList(_onFind);
-            _onFind.clear();
-        }
-        while (removed.size() > 0)
-            getContext().jobQueue().addJob((Job)removed.remove(0));
-    }
-}
-
-class FloodLookupTimeoutJob extends JobImpl {
-    private FloodSearchJob _search;
-    public FloodLookupTimeoutJob(RouterContext ctx, FloodSearchJob job) {
-        super(ctx);
-        _search = job;
-    }
-    public void runJob() {
-        _search.decrementRemaining();
-        if (_search.getLookupsRemaining() <= 0)
-            _search.failed(); 
-    }
-    public String getName() { return "NetDb search (phase 1) timeout"; }
-}
-
-class FloodLookupMatchJob extends JobImpl implements ReplyJob {
-    private Log _log;
-    private FloodSearchJob _search;
-    public FloodLookupMatchJob(RouterContext ctx, FloodSearchJob job) {
-        super(ctx);
-        _log = ctx.logManager().getLog(FloodLookupMatchJob.class);
-        _search = job;
-    }
-    public void runJob() { 
-        if ( (getContext().netDb().lookupLeaseSetLocally(_search.getKey()) != null) ||
-             (getContext().netDb().lookupRouterInfoLocally(_search.getKey()) != null) ) {
-            _search.success();
-        } else {
-            int remaining = _search.getLookupsRemaining();
-            if (_log.shouldLog(Log.INFO))
-                _log.info(getJobId() + "/" + _search.getJobId() + ": got a reply looking for " 
-                          + _search.getKey().toBase64() + ", with " + remaining + " outstanding searches");
-            // netDb reply pointing us at other people
-            if (remaining <= 0)
-                _search.failed();
-        }
-    }
-    public String getName() { return "NetDb search (phase 1) match"; }
-    public void setMessage(I2NPMessage message) {}
-}
-
-class FloodLookupSelector implements MessageSelector {
-    private RouterContext _context;
-    private FloodSearchJob _search;
-    public FloodLookupSelector(RouterContext ctx, FloodSearchJob search) {
-        _context = ctx;
-        _search = search;
-    }
-    public boolean continueMatching() { return _search.getLookupsRemaining() > 0; }
-    public long getExpiration() { return _search.getExpiration(); }
-    public boolean isMatch(I2NPMessage message) {
-        if (message == null) return false;
-        if (message instanceof DatabaseStoreMessage) {
-            DatabaseStoreMessage dsm = (DatabaseStoreMessage)message;
-            // is it worth making sure the reply came in on the right tunnel?
-            if (_search.getKey().equals(dsm.getKey())) {
-                _search.decrementRemaining();
-                return true;
-            }
-        } else if (message instanceof DatabaseSearchReplyMessage) {
-            DatabaseSearchReplyMessage dsrm = (DatabaseSearchReplyMessage)message;
-            if (_search.getKey().equals(dsrm.getSearchKey())) {
-                _search.decrementRemaining();
-                return true;
-            }
-        }
-        return false;
-    }   
-}