Fixes to make detect-tor run on Bro master from Keith Lehigh