curl, ipcalc, libtalloc, libtevent, squid, wireshark
Merge remote-tracking branch 'upstream/master'

Merging the upstream branch from PhantomX