Commit 5683e2b1a8a472ada2b3dcd6b684723256bffa60

Nick Mathewson 2012-01-20T16:31:20

Merge remote-tracking branch 'github/linked_list' Conflicts: include/event2/event_struct.h