Better error if generating fingerprint fails
The pile of changes that goes along with 13718
Merge branch 'master' of https://git.torproject.org/chutney