[tor-commits] [oonib/master] Do some refactoring and cleaning up of the various handlers.