missing comma
spelling in cjdroute.conf, set DEFAULT_MAX_TRIES to 3 and align the allocator pointer in UDPAddrIface
Also align the pointer in Pipe
Merge branch 'master' of git://github.com/rbtcollins/cjdns into next
Merge branch 'master' of git://github.com/thefinn93/cjdns into next
Merge branch 'master' of https://github.com/cjdelisle/cjdns
Fixed the LSB tags so debian won't bitch
Updated cnacl bcause it was not building properly on x86_NO_SSE2
Merge branch 'master' of https://github.com/thefinn93/cjdns into next
More work on Windows port and made Message.h functions take an exception handler to throw in case of buffer overflow.
Removed the little-used exception codes
Revert "switching from node graph to link graph"

This reverts commit e904cc0cf68f6bcc5334a73a60d4e9f97a8fa8bb.
merged next branch, step 1
better debugging
Don't handle addresses as names if they are specified in IP form
misc cleanup
Seperated encoding scheme definition into seperate module
moved checkfiles into cmake and trashed cjdns.sh which is broken and nolonger worth using
realloc(x, 0) should alias to free(x)
Added a benchmark