Merge proposals

ettercap has no merge proposals.