Commit 4560b31bdf1ed633518ebbdd0b3e11ffa1272cf5

Nick Mathewson 2011-03-07T23:00:45

Merge remote branch 'origin/patches-2.0' Conflicts: event-internal.h