properly handle old Tor variable and type definitions

fixes shadow/shadow#224