to branch 'i2p.i2p' (head cd632db729aa84ae0c27c5863cb11820f0adb950)

     and 'ad6ebc8a0672f769ddc142886e0ce9e7fb344180'

Fix arraycopy argument order in unused SocksHeader
Add deleted reseed cert to deletelist.txt
Fix minimum version for SSU extended options

     and 'e0b151c2f0595a79a9580334568d9e9c520ed956'

     and 'd577249d0bf080d821db013df9a945dd87217a09'

Clean up text on the conflict page for readability.

Don't trim whitespace, messes up title

Fix zxing build from top

which is BSD licensed.
Heavily modified to add UTF box chars, colors, and HTML options.
Work in progress.
Add random art servlet to the imagegen webapp.
Heavily modified from the example in the identicon package,
which is MIT licensed.

servlets for identicon and qr images.
Heavily modified from the example in the identicon package,
which is MIT licensed.

This is a small portion of zxing, including only what's required
to generate QR codes.
Pulled from https://github.com/zxing/zxing on Jan. 4, 2016,
rev 4e3abafe3008e02695f894eccf05f8257fca4ee9 dated Dec. 9, 2015.
Contains only the files we need.
Unmodified.
License: Apache 2.0

Add build.xml
Add i2p notes
Remove commons-logging dependency

Pulled from https://github.com/PauloMigAlmeida/identicon on Jan. 4, 2016,
rev 96902d3c7c9733d9da4cce9c5ed424557fc2ec3c dated April 10, 2015.
Contains only the files we need.
Unmodified, changes to follow.
License: MIT

as it isn't reliable
cleanup and log tweaks

source: https://en.wikipedia.org/wiki/OpenDocument_technical_specification

Change from 60s DHS to 60m DBF
Use reply key as filter key, not first part of
encrypted data, to match the specs and hopefully reduce dups
BuildMessageProcessor cleanups
log and stat tweaks
remove deprecated methods
remove some timing measurements
javadocs

support sig types or encrypted replies (ticket #1742)