Updated the TOR document with right port information
Correcting a bug
Protocol switch patch
Merge branch 'protswitch' into native_i2p

Conflicts:
	doc/Tor.txt
	src/main.cpp