Merge branch 'module-connlimit' into testing

Conflicts:
	txircd/modules/extra/connlimit.py