bootstrap update
Merge branch 'master' of https://github.com/notsecure/winTox

Conflicts:
	bootstrap.h