* Javadocs

* Base64: comment out some unused methods
* Remove huge whitespace in CryptoConstants
* ElGamalAESEngine:
  - Reduce rates
  - Check number of tags earlier

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

@@ -26,6 +26,7 @@ import net.i2p.util.Log;
 
 /**
  * Supports the following:
+ *<pre>
  *   (where protocol is generally HTTP/1.1 but is ignored)
  *   (where host is one of:
  *      example.i2p
@@ -39,16 +40,19 @@ import net.i2p.util.Log;
  *   CONNECT host protocol
  *   CONNECT host:port
  *   CONNECT host:port protocol (this is the standard)
+ *</pre>
  *
  * Additional lines after the CONNECT line but before the blank line are ignored and stripped.
  * The CONNECT line is removed for .i2p accesses
  * but passed along for outproxy accesses.
  *
  * Ref:
+ *<pre>
  *  INTERNET-DRAFT                                              Ari Luotonen
  *  Expires: September 26, 1997          Netscape Communications Corporation
  *  <draft-luotonen-ssl-tunneling-03.txt>                     March 26, 1997
  *                     Tunneling SSL Through a WWW Proxy
+ *</pre>
  *
  * @author zzz a stripped-down I2PTunnelHTTPClient
  */

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

@@ -127,6 +127,8 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr
                     // this does not increment totalSent
                     i2pout.write(initialI2PData);
                     // do NOT flush here, it will block and then onTimeout.run() won't happen on fail.
+                    // But if we don't flush, then we have to wait for the connectDelay timer to fire
+                    // in i2p socket? To be researched and/or fixed.
                     //i2pout.flush();
                 }
             }

apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java

@@ -176,7 +176,11 @@ public class I2PSocketManagerFull implements I2PSocketManager {
     }
     
     /**
-     * Create a new connected socket (block until the socket is created)
+     * Create a new connected socket. Blocks until the socket is created,
+     * unless the connectDelay option (i2p.streaming.connectDelay) is
+     * set and greater than zero. If so this will return immediately,
+     * and the client may quickly write initial data to the socket and
+     * this data will be bundled in the SYN packet.
      *
      * @param peer Destination to connect to
      * @param options I2P socket options to be used for connecting
@@ -199,6 +203,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         if (_log.shouldLog(Log.INFO))
             _log.info("Connecting to " + peer.calculateHash().toBase64().substring(0,6) 
                       + " with options: " + opts);
+        // the following blocks unless connect delay > 0
         Connection con = _connectionManager.connect(peer, opts);
         if (con == null)
             throw new TooManyStreamsException("Too many streams (max " + _maxStreams + ")");
@@ -212,7 +217,11 @@ public class I2PSocketManagerFull implements I2PSocketManager {
     }
 
     /**
-     * Create a new connected socket (block until the socket is created)
+     * Create a new connected socket. Blocks until the socket is created,
+     * unless the connectDelay option (i2p.streaming.connectDelay) is
+     * set and greater than zero in the default options. If so this will return immediately,
+     * and the client may quickly write initial data to the socket and
+     * this data will be bundled in the SYN packet.
      *
      * @param peer Destination to connect to
      *