Lock instead of using unprotected boolean
Merge branch 'master' of https://github.com/arschles/gotp
Merge branch 'master' into netchan

Conflicts:
	actor.go