Nick, Here's my WIP for prop 179: https://gitweb.torproject.org/ioerror/tor.git/commit/f3bb6846975193d9a6649c31f94bda47e4014070 I think removing the static cert stuff from the code and the proposal is probably a good idea.