to branch 'i2p.i2p' (head d2424406b9f3877644a1334df71313b6cba018e4)

      - Retry port forward if it fails
      - Make peers.jsp display faster
      - Lengthen POST timeout
      - More comments

    * added zap command to shut down BOB... now we need a way to start it
      after it stops. :-)

      - More stubs for per-destination managers.
        No functional changes yet.

    * SendGarlicMessageJob: Delete, unused
    * config.jsp: Comment out unused burst config code

      - Don't instantiate unused SessionKeyPersistenceHelper
      - Use TransientSessionKeyManager instead of PersistentSessionKeyManager
      - Add generics to TransientSessionKeyManager to help understand it
      - Change initial session map size to 64 (was 1024)
      - Prepare for per-destination SessionKeyManagers in ElGamalAESEngine

      - Adjust bids when near conn capacity
      - peers.jsp HTML fixes

      - config.jsp now cause graceful restart
    * UPnP:
      - Tweak to help startup problems
   * UDP:
      - Only save IP when it changes

      Configure with 'router.defaultProcessingTimeThrottle'.

      to avoid unwanted throttling

      - Use CSS for form messages
      - Goodbye nonce spoof message
      - tunnels.jsp improvements

            to branch 'i2p.i2p' (head 5551e9b0487e14e901cd1081ce3e1ffd33c4a354)

      - Fix infinite loop through the SYN queue caused by race,
        resulting in high CPU, OOMs, etc.

      - Don't send our own hash in the don't-include list when exploring
      - Remove any pending write when removing a RouterInfo
      - Cleanup to use routerHash()

            to branch 'i2p.i2p' (head 7ea5131c7a02f28ac2d3e23a8bf22558effb30ee)

      - Increasse routerinfo send frequency to every 90m (was 9h)
      - Don't send 3 floodfill infos at startup or with routerinfo

      - Use GeoIP to query a closer ntp source if available
      - Lengthen query time if well-synced
      - Cleanup

-5
merge of '8dc3dbded4d489ddca319052bf3cdb0c4d5a13cc'
     and 'afcd808741bf31d75eee2639e19d5e8946b62756'

SAMv1 and SAMv3 : logging some exception at INFO level

            to branch 'i2p.i2p' (head b977f0e1e1ca57e78d599943dcbf492e474c631a)

      - Submitter (walking) reports encoding as GB2312, and tested on windows
        with ff, IE6, chrome and opera. UTF-8 doesn't work. Still don't know why.