Re-introduce mapAskFor (so that we don't waste getdata messages with only 1 inv in each one)
Improve askfor logging

Conflicts:
	src/net.cpp
Add debug "tx" and "tx2" options