Bug 697126 - add backoff headers to tokenserver spec; r=telliott
Bug 958462 - make tokenserver support BrowserID generation numbers; r=telliott
Merge branch 'rfk/tokenserver-generations'

Conflicts:
	source/token/apis.rst