Fix errors caused by a bad merge of hsniff.c and remove a temp .orig file