Commit 7d08a28c1c8140491084186cbbce8135814f0e0f

Nick Mathewson 2011-07-05T15:07:07

Merge remote-tracking branch 'github/21_end_of_buffer' Conflicts: include/event2/buffer.h