Fix merge issues, to make tor_agent functional.