Switch to master branch of torpedo.

The fog changes are now merged to master.