Merge pull request #669 from alexandervdm/master

fix 'typedef redefinition' build errors on older gcc versions
Logging: Messenger's "Friend" and DHT's "DHT_Friend" don't necessarily use the same indices.

Match the indices beforehand and then log the matched up data.
Also log unmatched "DHT_Friend"s minimally.
Fixed bug with hole punching.
Don't hole punch when we are connected.
Merge pull request #670 from FullName/log-match-m_friend-and-dht_friend

Logging: Messenger's "Friend" and DHT's "DHT_Friend" don't necessarily use the same indices.