to branch 'i2p.i2p' (head 179b9a7974d64853c0c91924a5ad86e8b04ee7ba)

            to branch 'i2p.i2p' (head 010351f9470b0e699e17447c87daf6c67e5e5dcc)

      Prep for SessionKeyManager work in the router -
      Fix up SKM renderStatusHTML(); add debug.jsp to see it;
      Redefine getClientSessionKeyManager();
      More cleanups

      (more SKM prep)

      Prep for SessionKeyManager work in the router -
      Comment out, deprecate, and javadoc for unused keys and tags,
      they are vestiges of end-to-end crypto

        so we don't render error.jsp

    * Updates: Verify zip at startup before extracting
    * Wrapper: Take a couple fields out of the log so it's narrower

      - Prevent client destination theft by rejecting duplicates
      - Java 5 cleanups

    * DataHelper: Cleanup

      so that UTF-8 tunnel names are not corrupted by
      I2CP and can be displayed on the console
    * Fix UTF-8 form submission on console and i2ptunnel

      - Put favicon on every page
      - Make every page UTF-8

     and 'a95bd8209bbd14b8c0a590ba071ecf5a0191644d'

    * history for prop from test3, -16

            to branch 'i2p.i2p' (head e2ee75916f2ff6bd698585808a81071b44c978b1)

      - Fix problems where a requested unsigned update would actually
        kick off a signed update
      - Fix problem when policy set to notify, and clicking
        check for update, incorrectly causing unsigned update download
        and bad messages
      - Verify zip integrity of unsigned updates
      - Move zip files to router dir, not base dir
      - More tweaks and cleanup

      - Rename the Failing column
      - Reduce the time cutoff again to 90m (was 2h)

      Somehow, when I implemented UPnP, I thought it was required,
      but it isn't. ~50KB

      - Fix BufferedStatsLog so it works at all
      - Don't instantiate BufferedStatsLog unless stats.logFilters
        property is defined (restart now required to enable logging)
        This eliminates the StatLogWriter thread and a decent
        amount of memory.
      - Move two CLI classes out of the lib
      - Commment out places where getStatLog() isn't checked for null
      - Cleanups

    * DataHelper, Router:
      - Save config files in UTF-8 rather than the default encoding,
        since we read them in UTF-8
    * jetty.xml: Change encoding to UTF-8
    * logs.jsp: Add system encoding
    * NTCP: Clean up clock skew shitlist message
    * Shitlist: Clean up expire message
    * WorkingDir: Ensure modified files are processed with UTF-8 encoding