up patchlevel
Add some missing #ifs for this stupid configure bug
Merge branch 'hotfix/stupid_configure_bug' of github.com:oftc/oftc-hybrid into hotfix/stupid_configure_bug
update version
Merge branch 'hotfix/stupid_configure_bug'

Conflicts:
	include/patchlevel.h
	servlink/control.c