and '766a92b57cdf82d3b1d1e3a71ef2a3109e883add'

Add javadoc package.html
Fix import order

  Split out the defaults for expl/client IB/OB.
  Client default now 3 hops.
  Expl default still 2 hops, with OB Expl + 0-1,
  en route to 3+0.

 This was done back when we were desperate for
 build improvement but it's bad for anonymity
 and probably a little slow also

* SOCKS5Server: Remove redundant, commented out line from my previous findbugs

  - Don't expire if too few routers
  - Don't expire if net is disconnected
  - Don't run in VMCommSystem

May need to tweak the wording

i2psnark: Set User-Agent

 - Just before midnight, flood to new location too so lookups
   don't fail after keyspace rotation (ticket #510)
 - Refactor RoutingKeyGenerator and UpdateRoutingKeyModifierJob
   in support of the above
 - Display next key on LS debug page

 - Increase new kad size to K=24, B=4
 - Fix router count by counting in the data store, not the kbuckets
 - Randomize the order we load router infos at startup so we
   don't bias the kbuckets

 - Show destination for persistent client key only if available;
   show b32 for the key as well

     and 'b2c58f8462ab5c08682b711436c387b421bdd0c2'

            to branch 'i2p.i2p' (head 98569f30891693e6888913f50b88d1f37969fe45)

            to branch 'i2p.i2p' (head c9b1eef91f61f4482ad11c4f2b2d01be67a17ad2)

            to branch 'i2p.i2p' (head 0ac335d5dc4ccaeb113af4fb5c0e993a6f42fdbe)

   broken in 0.9.9

i2psnark: Disable streaming pings (ticket #1142)