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

rename shadowing field in inner class

            to branch 'i2p.i2p' (head 1b89427bd2952dc4be08fba14ad1d814d722739f)

- from 7 to 6 if not ff
- from 7 to 3 if ff (we don't need to backtrack much if any, we know most of the ffs)

O/P conn limit adjustment

which will make the network-down message in the console consistent.
Javadocs for getActivePeers() and getActiveSendPeers()
Make getActivePeers() and getActiveSendPeers() abstract in TransportImpl
Make getActivePeers() and getActiveSendPeers() more efficient
Preliminary conn limits for P/X
Log tweaks

            to branch 'i2p.i2p' (head 20e0a6d51df8fa6918a48ac01c808e56d3540bf1)

     and '9c1c14d60b15e3d9eed4b291a7fae39c11d3c993'

 * Replace SimpleScheduler with SimpleTimer2
 * Bump version number

            to branch 'i2p.i2p' (head 5698b31632398b8156a3b4cc215fed677cf205bf)

           signature using connection's destination
Log tweaks
Remove 0 arg from addRateData() calls

- hardening (restrict access to proc to owner)
- removing files covered by abstractions
- indentation per apparmor profile style

Remove meeh.i2p as update host (ticket #1515)
Re-add 193.xxx https reseed
Fix SocketManagerFactory property handling
Restore UPnP locale fix lost in the merge
i2ptunnel finals
I2NP unique id fixes
duplicate done() in ReseedChecker
bigger langbox in CSS
reformatting
Javadocs

i2psnark: Remove extra mime types in i2psnark web.xml;
added to Jetty's default by now, or in our mime.properties file