fix conflict
Fixed a small bug in the FragmentHandler which caused messages to be
sent out as TunnelData messages instead of TunnelGateway messages.
Add Zlib to CMakeLists.txt , fix SSU Fragment size
Merge branch 'master' of http://git.repo.i2p/r/i2pcpp