Another question for you, nickm: Should trunnel_abort() be tor_abort_() or tor_raw_abort_() ? If so, how can I define trunnel_abort() before including trunnel-impl.h ?